Remove SkOpts_avx and _ssse3 completely
All clients are updated to not build these any longer
Bug: b/40045066
Change-Id: Id1349adf1ba5456972f17209d419689c32eaffbc
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/744056
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Kevin Lubick <kjlubick@google.com>
diff --git a/BUILD.gn b/BUILD.gn
index 1c5c52d..42dc06e 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -172,26 +172,6 @@
is_x86 = current_cpu == "x64" || current_cpu == "x86"
-opts("ssse3") {
- enabled = is_x86
- sources = skia_opts.ssse3_sources
- if (!is_clang && is_win) {
- defines = [ "SK_CPU_SSE_LEVEL=SK_CPU_SSE_LEVEL_SSSE3" ]
- } else {
- cflags = [ "-mssse3" ]
- }
-}
-
-opts("avx") {
- enabled = is_x86
- sources = skia_opts.avx_sources
- if (is_win) {
- cflags = [ "/arch:AVX" ]
- } else {
- cflags = [ "-mavx" ]
- }
-}
-
opts("hsw") {
enabled = is_x86
sources = skia_opts.hsw_sources
@@ -1496,7 +1476,6 @@
deps = [
":android_utils",
":avif",
- ":avx",
":fontmgr_factory",
":heif",
":hsw",
@@ -1505,7 +1484,6 @@
":ndk_images",
":png_decode",
":raw",
- ":ssse3",
":typeface_fontations",
":vello",
":webp_decode",
@@ -1695,11 +1673,7 @@
public_configs = [ ":skia_public" ]
configs = skia_library_configs
- deps = [
- ":avx",
- ":hsw",
- ":ssse3",
- ]
+ deps = [ ":hsw" ]
sources = []
sources += skia_pathops_sources
diff --git a/gn/gn_to_bp.py b/gn/gn_to_bp.py
index 86bf8ce..07d0645 100755
--- a/gn/gn_to_bp.py
+++ b/gn/gn_to_bp.py
@@ -782,9 +782,7 @@
'cflags': bpfmt(8, cflags, False),
'cflags_cc': bpfmt(8, cflags_cc),
- 'x86_srcs': bpfmt(16, strip_headers(defs['ssse3'] +
- defs['avx' ] +
- defs['hsw' ])),
+ 'x86_srcs': bpfmt(16, strip_headers(defs['hsw' ])),
'gm_includes' : bpfmt(8, gm_includes),
'gm_srcs' : bpfmt(8, gm_srcs),
diff --git a/gn/opts.gni b/gn/opts.gni
index f2e49fb..b65600c 100644
--- a/gn/opts.gni
+++ b/gn/opts.gni
@@ -6,6 +6,4 @@
# Things are easiest for everyone if these source paths are absolute.
_src = get_path_info("../src", "abspath")
-ssse3 = [ "$_src/opts/SkOpts_ssse3.cpp" ]
-avx = [ "$_src/opts/SkOpts_avx.cpp" ]
hsw = [ "$_src/opts/SkOpts_hsw.cpp" ]
diff --git a/gn/shared_sources.gni b/gn/shared_sources.gni
index 25a50dd..44daadb 100644
--- a/gn/shared_sources.gni
+++ b/gn/shared_sources.gni
@@ -17,8 +17,5 @@
import("xml.gni")
import("xps.gni")
skia_opts = {
- none_sources = []
- ssse3_sources = ssse3
- avx_sources = avx
hsw_sources = hsw
}
diff --git a/src/opts/BUILD.bazel b/src/opts/BUILD.bazel
index 7add537..de3b69e 100644
--- a/src/opts/BUILD.bazel
+++ b/src/opts/BUILD.bazel
@@ -51,24 +51,6 @@
]
skia_cc_library(
- name = "ssse3", # https://en.wikipedia.org/wiki/SSSE3
- srcs = ["SkOpts_ssse3.cpp"],
- copts = DEFAULT_COPTS + ["-mssse3"],
- local_defines = DEFAULT_DEFINES + DEFAULT_LOCAL_DEFINES,
- textual_hdrs = OPTS_HDRS,
- deps = ["@skia_user_config//:user_config"],
-)
-
-skia_cc_library(
- name = "avx", # https://en.wikipedia.org/wiki/Advanced_Vector_Extensions
- srcs = ["SkOpts_avx.cpp"],
- copts = DEFAULT_COPTS + ["-mavx"],
- local_defines = DEFAULT_DEFINES + DEFAULT_LOCAL_DEFINES,
- textual_hdrs = OPTS_HDRS,
- deps = ["@skia_user_config//:user_config"],
-)
-
-skia_cc_library(
name = "hsw", # https://en.wikipedia.org/wiki/Advanced_Vector_Extensions#Advanced_Vector_Extensions_2
srcs = ["SkOpts_hsw.cpp"],
copts = DEFAULT_COPTS + ["-march=haswell"],
@@ -88,9 +70,7 @@
],
deps = selects.with_or({
("@platforms//cpu:x86_64", "@platforms//cpu:x86_32"): [
- ":avx",
":hsw",
- ":ssse3",
],
# We have no architecture specific optimizations for ARM64 right now
"@platforms//cpu:arm64": [],
diff --git a/src/opts/SkOpts_avx.cpp b/src/opts/SkOpts_avx.cpp
deleted file mode 100644
index bdc172e..0000000
--- a/src/opts/SkOpts_avx.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright 2016 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-// This file intentionally blank until references are removed from client projects
diff --git a/src/opts/SkOpts_ssse3.cpp b/src/opts/SkOpts_ssse3.cpp
deleted file mode 100644
index 0a621da..0000000
--- a/src/opts/SkOpts_ssse3.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright 2015 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-// This file intentionally blank until references are removed from client projects
