move warning suppression to .bzl files

Author: SamGondelman

backends/vulkan/runtime/utils/VecUtils.h

@@ -148,14 +148,6 @@ inline constexpr bool less_than_lowest(const T& x) {
       x, std::is_unsigned<Limit>(), std::is_unsigned<T>());
 }
 
-// Suppress sign compare warning when compiling with GCC
-// as later does not account for short-circuit rule before
-// raising the warning, see https://godbolt.org/z/Tr3Msnz99
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wsign-compare"
-#endif
-
 /*
  * Returns true if x is greater than the greatest value of the type Limit
  */
@@ -166,10 +158,6 @@ inline constexpr bool greater_than_max(const T& x) {
   return can_overflow && x > std::numeric_limits<Limit>::max();
 }
 
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
-#endif
-
 template <typename To, typename From>
 std::enable_if_t<
     std::is_integral<From>::value && !std::is_same<From, bool>::value,

backends/vulkan/targets.bzl

@@ -5,7 +5,14 @@ load("@fbsource//tools/build_defs:platform_defs.bzl", "ANDROID", "CXX", "FBCODE"
 
 
 def get_vulkan_compiler_flags():
-    return ["-Wno-missing-prototypes", "-Wno-global-constructors"]
+    return select({
+        "DEFAULT": [
+            "-Wno-global-constructors",
+            "-Wno-missing-prototypes",
+            "-Wno-sign-compare",
+        ],
+        "ovr_config//os:windows": [],
+    })
 
 def get_labels(no_volk):
     if no_volk:

runtime/core/named_data_map.h

@@ -7,9 +7,6 @@
  */
 
 #pragma once
-// Disable -Wdeprecated-declarations, as some builds use 'Werror'.
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 
 #include <executorch/runtime/core/exec_aten/exec_aten.h>
 #include <executorch/runtime/core/freeable_buffer.h>
@@ -77,5 +74,3 @@ class ET_EXPERIMENTAL NamedDataMap {
 
 } // namespace runtime
 } // namespace executorch
-
-#pragma GCC diagnostic pop

runtime/core/portable_type/c10/c10/targets.bzl

@@ -5,6 +5,13 @@ def get_sleef_preprocessor_flags():
         return []
     return ["-DAT_BUILD_ARM_VEC256_WITH_SLEEF"]
 
+def get_compiler_flags():
+    return select({
+        "DEFAULT": [
+            "-Wno-sign-compare",
+        ],
+        "ovr_config//os:windows": [],
+    })
 
 def define_common_targets():
     """Defines targets that should be shared between fbcode and xplat.
@@ -14,6 +21,7 @@ def define_common_targets():
     """
     runtime.cxx_library(
         name = "c10",
+        compiler_flags = get_compiler_flags(),
         header_namespace = "c10",
         exported_headers = [
             "macros/Export.h",

runtime/core/portable_type/c10/c10/util/TypeSafeSignMath.h

@@ -66,14 +66,6 @@ inline constexpr bool signs_differ(const T& a, const U& b) {
   return is_negative(a) != is_negative(b);
 }
 
-// Suppress sign compare warning when compiling with GCC
-// as later does not account for short-circuit rule before
-// raising the warning, see https://godbolt.org/z/Tr3Msnz99
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wsign-compare"
-#endif
-
 /// Returns true if x is greater than the greatest value of the type Limit
 template <typename Limit, typename T>
 inline constexpr bool greater_than_max(const T& x) {
@@ -82,10 +74,6 @@ inline constexpr bool greater_than_max(const T& x) {
   return can_overflow && x > std::numeric_limits<Limit>::max();
 }
 
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
-#endif
-
 /// Returns true if x < lowest(Limit). Standard comparison
 template <typename Limit, typename T>
 inline constexpr bool less_than_lowest(

runtime/core/targets.bzl

@@ -26,6 +26,14 @@ def get_core_flags():
     core_flags += ["-DET_ENABLE_ENUM_STRINGS=" + ("1" if enable_enum_strings() else "0")]
     return core_flags
 
+def get_compiler_flags():
+    return select({
+        "DEFAULT": [
+            "-Wno-deprecated-declarations",
+        ],
+        "ovr_config//os:windows": [],
+    })
+
 def define_common_targets():
     """Defines targets that should be shared between fbcode and xplat.
 
@@ -136,6 +144,7 @@ def define_common_targets():
 
     runtime.cxx_library(
         name = "named_data_map",
+        compiler_flags = get_compiler_flags(),
         exported_headers = [
             "named_data_map.h",
         ],

runtime/executor/method.h

@@ -7,9 +7,6 @@
  */
 
 #pragma once
-// Disable -Wdeprecated-declarations, as some builds use 'Werror'.
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 
 #include <executorch/runtime/core/evalue.h>
 #include <executorch/runtime/core/event_tracer.h>
@@ -401,5 +398,3 @@ namespace executor {
 using ::executorch::runtime::Method;
 } // namespace executor
 } // namespace torch
-
-#pragma GCC diagnostic pop

runtime/executor/program.h

@@ -7,9 +7,6 @@
  */
 
 #pragma once
-// Disable -Wdeprecated-declarations, as some builds use 'Werror'.
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 
 #include <cinttypes>
 #include <cstdint>
@@ -307,5 +304,3 @@ namespace executor {
 using ::executorch::runtime::Program;
 } // namespace executor
 } // namespace torch
-
-#pragma GCC diagnostic pop

runtime/executor/targets.bzl

@@ -21,6 +21,14 @@ def _program_preprocessor_flags():
         fail("executorch.enable_program_verification must be one of 'true' or 'false'; saw '" +
              enable_verification + "'")
 
+def get_compiler_flags():
+    return select({
+        "DEFAULT": [
+            "-Wno-deprecated-declarations",
+        ],
+        "ovr_config//os:windows": [],
+    })
+
 def define_common_targets():
     """Defines targets that should be shared between fbcode and xplat.
 
@@ -58,6 +66,7 @@ def define_common_targets():
 
         runtime.cxx_library(
             name = "program_no_prim_ops" + aten_suffix,
+            compiler_flags = get_compiler_flags(),
             srcs = [
                 "method.cpp",
                 "method_meta.cpp",

runtime/executor/tensor_parser.h

@@ -7,9 +7,6 @@
  */
 
 #pragma once
-// Disable -Wdeprecated-declarations, as some builds use 'Werror'.
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 
 #include <executorch/runtime/core/evalue.h>
 #include <executorch/runtime/core/exec_aten/exec_aten.h>
@@ -154,4 +151,3 @@ using ::executorch::runtime::deserialization::parseTensorList;
 } // namespace deserialization
 } // namespace executor
 } // namespace torch
-#pragma GCC diagnostic pop