From 76cf60c06b230bfdca3f6210a04cb34234a87b03 Mon Sep 17 00:00:00 2001 From: "skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com" Date: Tue, 10 Jul 2018 14:59:26 +0000 Subject: Roll skia/third_party/skcms 8342d776db5a..ae6a7acc22e5 (1 commits) https://skia.googlesource.com/skcms.git/+log/8342d776db5a..ae6a7acc22e5 2018-07-10 mtklein@chromium.org build as C++ the normal way The AutoRoll server is located here: https://skcms-skia-roll.skia.org Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+/master/autoroll/README.md If the roll is causing failures, please contact the current sheriff, who should be CC'd on the roll, and stop the roller if necessary. CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel TBR=robertphillips@google.com Change-Id: I0d1ad63556eaec6cb0ed73d668bf6a7584f5ea70 Reviewed-on: https://skia-review.googlesource.com/140166 Reviewed-by: skcms-skia-autoroll Commit-Queue: skcms-skia-autoroll --- third_party/skcms/skcms.cc | 86 +++++++++++++++--------------------------- third_party/skcms/version.sha1 | 2 +- 2 files changed, 32 insertions(+), 56 deletions(-) diff --git a/third_party/skcms/skcms.cc b/third_party/skcms/skcms.cc index 41a67ff0a2..e81f94919a 100644 --- a/third_party/skcms/skcms.cc +++ b/third_party/skcms/skcms.cc @@ -1977,69 +1977,45 @@ typedef enum { #define TEST_FOR_HSW - static bool hsw_ok_ = false; - static void check_hsw_ok() { - // See http://www.sandpile.org/x86/cpuid.htm + static bool hsw_ok() { + static const bool ok = []{ + // See http://www.sandpile.org/x86/cpuid.htm - // First, a basic cpuid(1). - uint32_t eax, ebx, ecx, edx; - __asm__ __volatile__("cpuid" : "=a"(eax), "=b"(ebx), "=c"(ecx), "=d"(edx) - : "0"(1), "2"(0)); + // First, a basic cpuid(1). + uint32_t eax, ebx, ecx, edx; + __asm__ __volatile__("cpuid" : "=a"(eax), "=b"(ebx), "=c"(ecx), "=d"(edx) + : "0"(1), "2"(0)); - // Sanity check for prerequisites. - if ((edx & (1<<25)) != (1<<25)) { return; } // SSE - if ((edx & (1<<26)) != (1<<26)) { return; } // SSE2 - if ((ecx & (1<< 0)) != (1<< 0)) { return; } // SSE3 - if ((ecx & (1<< 9)) != (1<< 9)) { return; } // SSSE3 - if ((ecx & (1<<19)) != (1<<19)) { return; } // SSE4.1 - if ((ecx & (1<<20)) != (1<<20)) { return; } // SSE4.2 + // Sanity check for prerequisites. + if ((edx & (1<<25)) != (1<<25)) { return false; } // SSE + if ((edx & (1<<26)) != (1<<26)) { return false; } // SSE2 + if ((ecx & (1<< 0)) != (1<< 0)) { return false; } // SSE3 + if ((ecx & (1<< 9)) != (1<< 9)) { return false; } // SSSE3 + if ((ecx & (1<<19)) != (1<<19)) { return false; } // SSE4.1 + if ((ecx & (1<<20)) != (1<<20)) { return false; } // SSE4.2 - if ((ecx & (3<<26)) != (3<<26)) { return; } // XSAVE + OSXSAVE + if ((ecx & (3<<26)) != (3<<26)) { return false; } // XSAVE + OSXSAVE - { - uint32_t eax_xgetbv, edx_xgetbv; - __asm__ __volatile__("xgetbv" : "=a"(eax_xgetbv), "=d"(edx_xgetbv) : "c"(0)); - if ((eax_xgetbv & (3<<1)) != (3<<1)) { return; } // XMM+YMM state saved? - } - - if ((ecx & (1<<28)) != (1<<28)) { return; } // AVX - if ((ecx & (1<<29)) != (1<<29)) { return; } // F16C - if ((ecx & (1<<12)) != (1<<12)) { return; } // FMA (TODO: not currently used) - - // Call cpuid(7) to check for our final AVX2 feature bit! - __asm__ __volatile__("cpuid" : "=a"(eax), "=b"(ebx), "=c"(ecx), "=d"(edx) - : "0"(7), "2"(0)); - if ((ebx & (1<< 5)) != (1<< 5)) { return; } // AVX2 - - hsw_ok_ = true; - } + { + uint32_t eax_xgetbv, edx_xgetbv; + __asm__ __volatile__("xgetbv" : "=a"(eax_xgetbv), "=d"(edx_xgetbv) : "c"(0)); + if ((eax_xgetbv & (3<<1)) != (3<<1)) { return false; } // XMM+YMM state saved? + } - #if defined(_MSC_VER) - #include - INIT_ONCE check_hsw_ok_once = INIT_ONCE_STATIC_INIT; + if ((ecx & (1<<28)) != (1<<28)) { return false; } // AVX + if ((ecx & (1<<29)) != (1<<29)) { return false; } // F16C + if ((ecx & (1<<12)) != (1<<12)) { return false; } // FMA (TODO: not currently used) - static BOOL check_hsw_ok_InitOnce_wrapper(INIT_ONCE* once, void* param, void** ctx) { - (void)once; - (void)param; - (void)ctx; - check_hsw_ok(); - return TRUE; - } + // Call cpuid(7) to check for our final AVX2 feature bit! + __asm__ __volatile__("cpuid" : "=a"(eax), "=b"(ebx), "=c"(ecx), "=d"(edx) + : "0"(7), "2"(0)); + if ((ebx & (1<< 5)) != (1<< 5)) { return false; } // AVX2 - static bool hsw_ok() { - InitOnceExecuteOnce(&check_hsw_ok_once, check_hsw_ok_InitOnce_wrapper, - nullptr, nullptr); - return hsw_ok_; - } - #else - #include - static pthread_once_t check_hsw_ok_once = PTHREAD_ONCE_INIT; + return true; + }(); - static bool hsw_ok() { - pthread_once(&check_hsw_ok_once, check_hsw_ok); - return hsw_ok_; - } - #endif + return ok; + } #endif diff --git a/third_party/skcms/version.sha1 b/third_party/skcms/version.sha1 index 06fca98b00..f4aafa5a6d 100755 --- a/third_party/skcms/version.sha1 +++ b/third_party/skcms/version.sha1 @@ -1 +1 @@ -8342d776db5a2be1ce1e2c08a1f69c75d2b84425 \ No newline at end of file +ae6a7acc22e51960e2294bf8f97e681c1e47e78f \ No newline at end of file -- cgit v1.2.3