immintrin.h is not included in CUDA code.

jakurzak · Jan 5, 2022 · 91bc014 · 91bc014
1 parent 931865c
commit 91bc014
Show file tree

Hide file tree

Showing 17 changed files with 69 additions and 26 deletions.
diff --git a/apps/qsim_amplitudes.cc b/apps/qsim_amplitudes.cc
@@ -30,6 +30,7 @@
 #include "../lib/run_qsim.h"
 #include "../lib/simmux.h"
 #include "../lib/util.h"
+#include "../lib/util_cpu.h"
 
 constexpr char usage[] = "usage:\n  ./qsim_amplitudes -c circuit_file "
                          "-d times_to_save_results -i input_files "

diff --git a/apps/qsim_base.cc b/apps/qsim_base.cc
@@ -26,7 +26,7 @@
 #include "../lib/io_file.h"
 #include "../lib/run_qsim.h"
 #include "../lib/simmux.h"
-#include "../lib/util.h"
+#include "../lib/util_cpu.h"
 
 constexpr char usage[] = "usage:\n  ./qsim_base -c circuit -d maxtime "
                          "-s seed -t threads -f max_fused_size "

diff --git a/apps/qsim_von_neumann.cc b/apps/qsim_von_neumann.cc
@@ -28,7 +28,7 @@
 #include "../lib/io_file.h"
 #include "../lib/run_qsim.h"
 #include "../lib/simmux.h"
-#include "../lib/util.h"
+#include "../lib/util_cpu.h"
 
 constexpr char usage[] = "usage:\n  ./qsim_von_neumann -c circuit -d maxtime "
                          "-s seed -t threads -f max_fused_size "

diff --git a/apps/qsimh_amplitudes.cc b/apps/qsimh_amplitudes.cc
@@ -30,6 +30,7 @@
 #include "../lib/run_qsimh.h"
 #include "../lib/simmux.h"
 #include "../lib/util.h"
+#include "../lib/util_cpu.h"
 
 constexpr char usage[] = "usage:\n  ./qsimh_amplitudes -c circuit_file "
                          "-d maxtime -k part1_qubits "

diff --git a/apps/qsimh_base.cc b/apps/qsimh_base.cc
@@ -30,6 +30,7 @@
 #include "../lib/run_qsimh.h"
 #include "../lib/simmux.h"
 #include "../lib/util.h"
+#include "../lib/util_cpu.h"
 
 constexpr char usage[] = "usage:\n  ./qsimh_base -c circuit_file "
                          "-d maximum_time -k part1_qubits "

diff --git a/lib/BUILD b/lib/BUILD
@@ -61,6 +61,7 @@ cc_library(
         "unitary_calculator_basic.h",
         "unitary_calculator_sse.h",
         "util.h",
+        "util_cpu.h",
         "vectorspace.h",
     ],
 )
@@ -123,6 +124,7 @@ cc_library(
         "unitary_calculator_basic.h",
         "unitary_calculator_sse.h",
         "util.h",
+        "util_cpu.h",
         "util_cuda.h",
         "vectorspace.h",
         "vectorspace_cuda.h",
@@ -170,6 +172,7 @@ cc_library(
         "unitary_calculator_basic.h",
         "unitary_calculator_sse.h",
         "util.h",
+        "util_cpu.h",
         "vectorspace.h",
     ],
 )
@@ -208,6 +211,7 @@ cc_library(
         "statespace_basic.h",
         "statespace_sse.h",
         "util.h",
+        "util_cpu.h",
         "vectorspace.h",
     ],
 )
@@ -238,6 +242,11 @@ cc_library(
     hdrs = ["util.h"],
 )
 
+cc_library(
+    name = "util_cpu",
+    hdrs = ["util_cpu.h"],
+)
+
 # cuda_library
 cc_library(
     name = "util_cuda",

diff --git a/lib/util.h b/lib/util.h
@@ -15,10 +15,6 @@
 #ifndef UTIL_H_
 #define UTIL_H_
 
-#ifdef __SSE__
-# include <immintrin.h>
-#endif
-
 #include <algorithm>
 #include <chrono>
 #include <random>
@@ -88,23 +84,6 @@ inline std::vector<DistrRealType> GenerateRandomValues(
   return rs;
 }
 
-// This function sets flush-to-zero and denormals-are-zeros MXCSR control
-// flags. This prevents rare cases of performance slowdown potentially at
-// the cost of a tiny precision loss.
-inline void SetFlushToZeroAndDenormalsAreZeros() {
-#ifdef __SSE2__
-  _mm_setcsr(_mm_getcsr() | 0x8040);
-#endif
-}
-
-// This function clears flush-to-zero and denormals-are-zeros MXCSR control
-// flags.
-inline void ClearFlushToZeroAndDenormalsAreZeros() {
-#ifdef __SSE2__
-  _mm_setcsr(_mm_getcsr() & ~unsigned{0x8040});
-#endif
-}
-
 }  // namespace qsim
 
 #endif  // UTIL_H_
diff --git a/lib/util_cpu.h b/lib/util_cpu.h
@@ -0,0 +1,43 @@
+// Copyright 2019 Google LLC. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef UTIL_CPU_H_
+#define UTIL_CPU_H_
+
+#ifdef __SSE2__
+# include <immintrin.h>
+#endif
+
+namespace qsim {
+
+// This function sets flush-to-zero and denormals-are-zeros MXCSR control
+// flags. This prevents rare cases of performance slowdown potentially at
+// the cost of a tiny precision loss.
+inline void SetFlushToZeroAndDenormalsAreZeros() {
+#ifdef __SSE2__
+  _mm_setcsr(_mm_getcsr() | 0x8040);
+#endif
+}
+
+// This function clears flush-to-zero and denormals-are-zeros MXCSR control
+// flags.
+inline void ClearFlushToZeroAndDenormalsAreZeros() {
+#ifdef __SSE2__
+  _mm_setcsr(_mm_getcsr() & ~unsigned{0x8040});
+#endif
+}
+
+}  // namespace qsim
+
+#endif  // UTIL_CPU_H_
diff --git a/pybind_interface/avx2/pybind_main_avx2.cpp b/pybind_interface/avx2/pybind_main_avx2.cpp
@@ -16,6 +16,7 @@
 
 #include "../../lib/formux.h"
 #include "../../lib/simulator_avx.h"
+#include "../../lib/util_cpu.h"
 
 namespace qsim {
   template <typename For>

diff --git a/pybind_interface/avx512/pybind_main_avx512.cpp b/pybind_interface/avx512/pybind_main_avx512.cpp
@@ -16,6 +16,7 @@
 
 #include "../../lib/formux.h"
 #include "../../lib/simulator_avx512.h"
+#include "../../lib/util_cpu.h"
 
 namespace qsim {
   template <typename For>

diff --git a/pybind_interface/basic/pybind_main_basic.cpp b/pybind_interface/basic/pybind_main_basic.cpp
@@ -16,6 +16,7 @@
 
 #include "../../lib/formux.h"
 #include "../../lib/simulator_basic.h"
+#include "../../lib/util_cpu.h"
 
 namespace qsim {
   template <typename For>

diff --git a/pybind_interface/cuda/pybind_main_cuda.cpp b/pybind_interface/cuda/pybind_main_cuda.cpp
@@ -41,6 +41,9 @@ namespace qsim {
     StateSpace::Parameter ss_params;
     Simulator::Parameter sim_params;
   };
+
+  inline void SetFlushToZeroAndDenormalsAreZeros() {}
+  inline void ClearFlushToZeroAndDenormalsAreZeros() {}
 }
 
 #include "../pybind_main.cpp"
diff --git a/pybind_interface/custatevec/pybind_main_custatevec.cpp b/pybind_interface/custatevec/pybind_main_custatevec.cpp
@@ -53,6 +53,9 @@ struct Factory {
   custatevecHandle_t custatevec_handle;
 };
 
+inline void SetFlushToZeroAndDenormalsAreZeros() {}
+inline void ClearFlushToZeroAndDenormalsAreZeros() {}
+
 }
 
 #include "../pybind_main.cpp"
diff --git a/pybind_interface/pybind_main.cpp b/pybind_interface/pybind_main.cpp
@@ -30,7 +30,6 @@
 #include "../lib/qtrajectory.h"
 #include "../lib/run_qsim.h"
 #include "../lib/run_qsimh.h"
-#include "../lib/util.h"
 
 using namespace qsim;
 

diff --git a/pybind_interface/sse/pybind_main_sse.cpp b/pybind_interface/sse/pybind_main_sse.cpp
@@ -16,6 +16,7 @@
 
 #include "../../lib/formux.h"
 #include "../../lib/simulator_sse.h"
+#include "../../lib/util_cpu.h"
 
 namespace qsim {
   template <typename For>

diff --git a/tests/BUILD b/tests/BUILD
@@ -265,7 +265,7 @@ cc_library(
         "//lib:gate_appl",
         "//lib:gates_qsim",
         "//lib:io",
-        "//lib:util",
+        "//lib:util_cpu",
     ],
     testonly = 1,
 )

diff --git a/tests/simulator_testfixture.h b/tests/simulator_testfixture.h
@@ -27,7 +27,7 @@
 #include "../lib/gate_appl.h"
 #include "../lib/gates_qsim.h"
 #include "../lib/io.h"
-#include "../lib/util.h"
+#include "../lib/util_cpu.h"
 
 namespace qsim {