wip

pytorch · Mar 11, 2024 · 7f1fc44 · 7f1fc44
1 parent 50fc29c
commit 7f1fc44
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/.github/scripts/fbgemm_build.bash b/.github/scripts/fbgemm_build.bash
@@ -90,7 +90,7 @@ build_fbgemm_library () {
   echo "[BUILD] Running the build ..."
   # shellcheck disable=SC2086
   print_exec conda run --no-capture-output ${env_prefix} \
-    make -j 1 VERBOSE=1
+    make -j VERBOSE=1
 
   cd - || return 1
 }

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -406,8 +406,6 @@ endif()
 
 if(FBGEMM_BUILD_BENCHMARKS)
   add_subdirectory(bench)
-  append_cxx_flag_if_supported("-Wno-unused-variable" CMAKE_CXX_FLAGS)
-  append_cxx_flag_if_supported("-Wno-deprecated-volatile" CMAKE_CXX_FLAGS)
 endif()
 
 if(FBGEMM_BUILD_DOCS)

diff --git a/bench/BenchUtils.cc b/bench/BenchUtils.cc
@@ -53,13 +53,17 @@ void randFill(aligned_vector<int64_t>& vec, int64_t low, int64_t high) {
   std::generate(vec.begin(), vec.end(), [&] { return dis(eng); });
 }
 
+FBGEMM_PUSH_WARNING_AND_DISABLE("-Wdeprecated-volatile")
+
 void llc_flush(std::vector<char>& llc) {
   volatile char* data = llc.data();
   for (size_t i = 0; i < llc.size(); i++) {
     data[i]++;
   }
 }
 
+FBGEMM_POP_WARNING
+
 #ifdef __aarch64__
 void aarch64_flush_cache_line(void* addr) {
   asm volatile("dc civac, %0" ::"r"(addr) : "memory");

diff --git a/bench/BenchUtils.h b/bench/BenchUtils.h
@@ -35,6 +35,7 @@
 #endif
 
 #include "./AlignedVec.h"
+#include "fbgemm/Fbgemm.h"
 #include "fbgemm/FbgemmBuild.h"
 #include "fbgemm/FbgemmPackMatrixB.h"
 #include "src/RefImplementations.h"

diff --git a/bench/CMakeLists.txt b/bench/CMakeLists.txt
@@ -79,7 +79,6 @@ macro(add_benchmark BENCHNAME)
 endmacro()
 
 if(FBGEMM_BUILD_BENCHMARKS)
-
   set(BENCHMARKS "")
 
   file(GLOB BENCH_LIST "*Benchmark.cc")
@@ -97,4 +96,8 @@ if(FBGEMM_BUILD_BENCHMARKS)
   add_dependencies(run_benchmarks
     ${BENCHMARKS})
 
+  set_source_files_properties(
+    bench/GEMMsBenchmark.cc
+    PROPERTIES COMPILE_FLAGS "-Wno-unused-variable")
+
 endif()