Skia: AVX2 -> HSW

skia/BUILD.gn

 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//testing/test.gni")
 import("//third_party/skia/gn/shared_sources.gni")
 
 if (current_cpu == "arm") {
@@ skipping 542 matching lines @@
         cflags = [ "/arch:AVX" ]
       }
       visibility = [ ":skia_opts" ]
       configs -= [ "//build/config/compiler:chromium_code" ]
       configs += [
         ":skia_config",
         ":skia_library_config",
         "//build/config/compiler:no_chromium_code",
       ]
     }
-    source_set("skia_opts_avx2") {
-      sources = skia_opts.avx2_sources
+    source_set("skia_opts_hsw") {
+      sources = skia_opts.hsw_sources
       if (!is_win) {
-        cflags = [ "-mavx2" ]
+        cflags = [
+          "-mavx2",
+          "-mbmi",
+          "-mbmi2",
+          "-mf16c",
+          "-mfma",
+        ]
       }
       if (is_win) {
         cflags = [ "/arch:AVX2" ]
       }
       visibility = [ ":skia_opts" ]
       configs -= [ "//build/config/compiler:chromium_code" ]
       configs += [
         ":skia_config",
         ":skia_library_config",
         "//build/config/compiler:no_chromium_code",
       ]
     }
   }
 }
 
 source_set("skia_opts") {
   cflags = []
   defines = []
 
   deps = [
     "//base",
   ]
 
   if (skia_build_no_opts) {
     sources = skia_opts.none_sources
   } else if (current_cpu == "x86" || current_cpu == "x64") {
     sources = skia_opts.sse2_sources
     deps += [
       ":skia_opts_avx",
-      ":skia_opts_avx2",
+      ":skia_opts_hsw",
       ":skia_opts_sse3",
       ":skia_opts_sse41",
       ":skia_opts_sse42",
     ]
   } else if (current_cpu == "arm") {
     # The assembly uses the frame pointer register (r7 in Thumb/r11 in
     # ARM), the compiler doesn't like that.
     cflags += [ "-fomit-frame-pointer" ]
 
     if (arm_version >= 7) {
@@ skipping 109 matching lines @@
 
     deps = [
       ":skia",
       "//base",
       "//base/test:test_support",
       "//build/config/sanitizers:deps",
       "//build/win:default_exe_manifest",
     ]
   }
 }