From 1b9b7d539335030e3d269a57d418a4fa6d62c038 Mon Sep 17 00:00:00 2001 From: Mike Klein Date: Tue, 27 Feb 2018 10:37:40 -0500 Subject: Reland "Reland "make SkJumper stages normal Skia code"" This is a reland of 78cb579f33943421afc8423a39867fcfd69fed44 This time, lowp stages are controlled by !defined(JUMPER_IS_SCALAR), not by defined(__clang__). The two are usually the same, except when we opt Clang builds into JUMPER_IS_SCALAR artificially. Some Google3 builds use compilers old enough that they barf when compiling our NEON code. It's conceivably also possible to define JUMPER_IS_SCALAR yourself, but I don't think anyone does that. Original change's description: > Reland "make SkJumper stages normal Skia code" > > This is a reland of 22e536e3a1a09405d1c0e6f071717a726d86e8d4 > > Now with fixed #include paths in SkRasterPipeline_opts.h, > and -ffp-contract=fast for the :hsw target to minimize > diffs on non-Windows Clang AVX2/AVX-512 bots. > > Original change's description: > > make SkJumper stages normal Skia code > > > > Enough clients are using Clang now that we can say, use Clang to build > > if you want these software pipeline stages to go fast. > > > > This lets us drop the offline build aspect of SkJumper stages, instead > > building as part of Skia using the SkOpts framework. > > > > I think everything should work, except I've (temporarily) removed > > AVX-512 support. I will put this back in a follow up. > > > > I have had to drop Windows down to __vectorcall and our narrower > > stage calling convention that keeps the d-registers on the stack. > > I tried forcing sysv_abi, but that crashed Clang. :/ > > > > Added a TODO to up the same narrower stage calling convention > > for lowp stages... we just *don't* today, for no good reason. > > > > Change-Id: Iaaa792ffe4deab3508d2dc5d0008c163c24b3383 > > Reviewed-on: https://skia-review.googlesource.com/110641 > > Commit-Queue: Mike Klein > > Reviewed-by: Herb Derby > > Reviewed-by: Florin Malita > > Change-Id: I44f2c03d33958e3807747e40904b6351957dd448 > Reviewed-on: https://skia-review.googlesource.com/112742 > Reviewed-by: Mike Klein Change-Id: I3d71197d4bbb19ca4a94961a97fa2e54d5cbfb0d Reviewed-on: https://skia-review.googlesource.com/112744 Reviewed-by: Mike Klein Commit-Queue: Mike Klein --- gn/core.gni | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) (limited to 'gn/core.gni') diff --git a/gn/core.gni b/gn/core.gni index bcec7c02f0..12a74ae93b 100644 --- a/gn/core.gni +++ b/gn/core.gni @@ -440,6 +440,8 @@ skia_core_sources = [ "$_include/core/SkUnPreMultiply.h", "$_include/core/SkVertices.h", + "$_src/jumper/SkJumper.cpp", + # private "$_include/private/SkAtomics.h", "$_include/private/SkChecksum.h", @@ -527,20 +529,4 @@ skia_core_sources = [ "$_src/pathops/SkReduceOrder.h", ] -skia_core_sources += [ - "$_src/jumper/SkJumper.cpp", - "$_src/jumper/SkJumper_stages.cpp", - "$_src/jumper/SkJumper_stages_lowp.cpp", -] -skia_core_defines = [] -if (is_win) { - if (host_os == "win") { - skia_core_sources += [ "$_src/jumper/SkJumper_generated_win.S" ] - } else { - # TODO(thakis): Enable jumper in linux->win cross builds once the - # assembler situation is figured out, https://crbug.com/762167 - skia_core_defines += [ "SK_JUMPER_USE_ASSEMBLY=0" ] - } -} else if (target_cpu != "wasm") { - skia_core_sources += [ "$_src/jumper/SkJumper_generated.S" ] -} +skia_core_defines = [] # Used to be used by Chromium, but no longer. -- cgit v1.2.3