LiteRT-LM/PATCH.skia at main · google-ai-edge/LiteRT-LM · GitHub

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
diff --git a/modules/skcms/BUILD.bazel b/modules/skcms/BUILD.bazel
index 67d7c7abf1..61072d9682 100644
--- a/modules/skcms/BUILD.bazel
+++ b/modules/skcms/BUILD.bazel
@@ -70,6 +70,7 @@ skia_cc_library(
                ],
                "//conditions:default": [],
            }),
+    copts = select({"@platforms//os:windows": [], "//conditions:default": ["-Wno-switch-default"]}) + select({"@platforms//cpu:x86_64": ["-mfma", "-mf16c"], "//conditions:default": []}),
 )

 skia_cc_library(
@@ -84,6 +85,7 @@ skia_cc_library(
     textual_hdrs = [
         "src/Transform_inl.h",
     ],
+    copts = select({"@platforms//os:windows": [], "//conditions:default": ["-Wno-switch-default"]}) + select({"@platforms//cpu:x86_64": ["-mfma", "-mf16c"], "//conditions:default": []}),
 )

 skia_cc_library(
@@ -94,7 +96,7 @@ skia_cc_library(
         "src/skcms_internals.h",
         "src/skcms_public.h",
     ],
-    copts = DEFAULT_COPTS + select({
+    copts = DEFAULT_COPTS + select({"@platforms//os:windows": [], "//conditions:default": ["-Wno-switch-default"]}) + select({
         "@platforms//cpu:x86_64": ["-march=haswell"],
         "//conditions:default": [],
     }),
@@ -102,6 +104,7 @@ skia_cc_library(
     textual_hdrs = [
         "src/Transform_inl.h",
     ],
+    defines = ["SKCMS_DISABLE_HSW"],
 )

 skia_cc_library(
@@ -112,7 +115,8 @@ skia_cc_library(
         "src/skcms_internals.h",
         "src/skcms_public.h",
     ],
-    copts = DEFAULT_COPTS + select({
+    defines = ["SKCMS_DISABLE_SKX"],
+    copts = DEFAULT_COPTS + select({"@platforms//os:windows": [], "//conditions:default": ["-Wno-switch-default"]}) + select({
         "@platforms//cpu:x86_64": ["-march=skylake-avx512"],
         "//conditions:default": [],
     }),
diff --git a/src/codec/BUILD.bazel b/src/codec/BUILD.bazel
index adcf203240..9141d8b8c5 100644
--- a/src/codec/BUILD.bazel
+++ b/src/codec/BUILD.bazel
@@ -63,6 +63,7 @@ skia_cc_library(
         "//src/core",
         "//src/core:core_priv",
     ],
+    copts = select({"@platforms//os:windows": [], "//conditions:default": ["-Wno-switch-default"]}) + select({"@platforms//cpu:x86_64": ["-mfma", "-mf16c"], "//conditions:default": []}),
 )

 skia_cc_library(
@@ -152,6 +153,7 @@ skia_cc_library(
         "//src/core",
         "//src/core:core_priv",
     ],
+    copts = select({"@platforms//os:windows": [], "//conditions:default": ["-Wno-switch-default"]}) + select({"@platforms//cpu:x86_64": ["-mfma", "-mf16c"], "//conditions:default": []}),
 )

 skia_cc_library(
@@ -296,4 +298,4 @@ skia_cc_library(
         "//src/core",
         "//src/core:core_priv",
-        "@libjpeg_turbo",
+        "@libjpeg_turbo//:jpeg",
     ],
@@ -404,4 +406,4 @@ skia_cc_library(
         "//src/core",
         "//src/core:core_priv",
-        "@libpng",
+        "@libpng//:png",
     ],
diff --git a/src/core/BUILD.bazel b/src/core/BUILD.bazel
index 2f09530c03..2761a867db 100644
--- a/src/core/BUILD.bazel
+++ b/src/core/BUILD.bazel
@@ -503,6 +503,7 @@ skia_cc_library(
         ":load_sksl_from_disk_true": ["//src/utils:get_executable_path"],
         ":load_sksl_from_disk_false": [],
     }),
+    copts = select({"@platforms//os:windows": [], "//conditions:default": ["-Wno-switch-default"]}) + select({"@platforms//cpu:x86_64": ["-mfma", "-mf16c"], "//conditions:default": []}),
 )

 skia_cc_library(
diff --git a/src/opts/BUILD.bazel b/src/opts/BUILD.bazel
index 0390a21518..8222f1e348 100644
--- a/src/opts/BUILD.bazel
+++ b/src/opts/BUILD.bazel
@@ -35,7 +35,7 @@ skia_cc_library(
         "//src/shaders:opts_srcs",
         "//src/sksl/tracing:opts_srcs",
     ],
-    copts = DEFAULT_COPTS + ["-march=haswell"],
+    copts = DEFAULT_COPTS + ["-march=haswell"] + select({"@platforms//os:windows": [], "//conditions:default": ["-Wno-switch-default"]}),
     textual_hdrs = [
         "SkRasterPipeline_opts.h",
         ":textual_hdrs",
@@ -56,7 +56,7 @@ skia_cc_library(
         "//src/shaders:opts_srcs",
         "//src/sksl/tracing:opts_srcs",
     ],
-    copts = DEFAULT_COPTS + ["-march=skylake-avx512"],
+    copts = DEFAULT_COPTS + ["-march=skylake-avx512"] + select({"@platforms//os:windows": [], "//conditions:default": ["-Wno-switch-default"]}),
     textual_hdrs = [
         "SkRasterPipeline_opts.h",
         ":textual_hdrs",

diff --git a/include/config/copts.bzl b/include/config/copts.bzl
--- a/include/config/copts.bzl
+++ b/include/config/copts.bzl
@@ -64,5 +64,4 @@
     "-fcolor-diagnostics",
     "-Wall",
-    "-Werror",
     "-Weverything",
     "-Wextra",