From a2137ea3cbb8b5107cd57de427d65ee9d0f1b5f9 Mon Sep 17 00:00:00 2001 From: Peter Michael Green Date: Wed, 7 Oct 2020 19:41:49 +0000 Subject: [PATCH] Disable neon in qcms. Gbp-Pq: Name disable-neon-in-qcms.patch --- gfx/qcms/qcmsint.h | 24 ++++++++++++------------ gfx/qcms/transform.cpp | 2 +- gfx/tests/gtest/TestQcms.cpp | 30 +++++++++++++++--------------- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/gfx/qcms/qcmsint.h b/gfx/qcms/qcmsint.h index 0daeda9614e..71fc31bc038 100644 --- a/gfx/qcms/qcmsint.h +++ b/gfx/qcms/qcmsint.h @@ -344,18 +344,18 @@ void qcms_transform_data_bgra_out_lut_altivec(const qcms_transform *transform, unsigned char *dest, size_t length); -void qcms_transform_data_rgb_out_lut_neon(const qcms_transform *transform, - const unsigned char *src, - unsigned char *dest, - size_t length); -void qcms_transform_data_rgba_out_lut_neon(const qcms_transform *transform, - const unsigned char *src, - unsigned char *dest, - size_t length); -void qcms_transform_data_bgra_out_lut_neon(const qcms_transform *transform, - const unsigned char *src, - unsigned char *dest, - size_t length); +//void qcms_transform_data_rgb_out_lut_neon(const qcms_transform *transform, +// const unsigned char *src, +// unsigned char *dest, +// size_t length); +//void qcms_transform_data_rgba_out_lut_neon(const qcms_transform *transform, +// const unsigned char *src, +// unsigned char *dest, +// size_t length); +//void qcms_transform_data_bgra_out_lut_neon(const qcms_transform *transform, +// const unsigned char *src, +// unsigned char *dest, +// size_t length); extern bool qcms_supports_iccv4; extern bool qcms_supports_neon; diff --git a/gfx/qcms/transform.cpp b/gfx/qcms/transform.cpp index 21bc5a55eae..5c8ab622640 100644 --- a/gfx/qcms/transform.cpp +++ b/gfx/qcms/transform.cpp @@ -1240,7 +1240,7 @@ qcms_transform* qcms_transform_create( #endif } else #endif -#if defined(__arm__) || defined(__aarch64__) +#if 0 // defined(__arm__) || defined(__aarch64__) if (qcms_supports_neon) { if (in_type == QCMS_DATA_RGB_8) { transform->transform_fn = qcms_transform_data_rgb_out_lut_neon; diff --git a/gfx/tests/gtest/TestQcms.cpp b/gfx/tests/gtest/TestQcms.cpp index 83d361e17df..a5f2c6414d2 100644 --- a/gfx/tests/gtest/TestQcms.cpp +++ b/gfx/tests/gtest/TestQcms.cpp @@ -493,11 +493,11 @@ void GfxQcms_ProfilePairBase::TransformPrecachePlatformExt() { EXPECT_TRUE(ProduceVerifyOutput(qcms_transform_data_rgb_out_lut_avx)); } #endif -#ifdef MOZILLA_MAY_SUPPORT_NEON - if (mozilla::supports_neon()) { - EXPECT_TRUE(ProduceVerifyOutput(qcms_transform_data_rgb_out_lut_neon)); - } -#endif +//#ifdef MOZILLA_MAY_SUPPORT_NEON +// if (mozilla::supports_neon()) { +// EXPECT_TRUE(ProduceVerifyOutput(qcms_transform_data_rgb_out_lut_neon)); +// } +//#endif // Verify RGBA transforms. ASSERT_TRUE(SetBuffers(QCMS_DATA_RGBA_8)); @@ -518,11 +518,11 @@ void GfxQcms_ProfilePairBase::TransformPrecachePlatformExt() { EXPECT_TRUE(ProduceVerifyOutput(qcms_transform_data_rgba_out_lut_avx)); } #endif -#ifdef MOZILLA_MAY_SUPPORT_NEON - if (mozilla::supports_neon()) { - EXPECT_TRUE(ProduceVerifyOutput(qcms_transform_data_rgba_out_lut_neon)); - } -#endif +//#ifdef MOZILLA_MAY_SUPPORT_NEON +// if (mozilla::supports_neon()) { +// EXPECT_TRUE(ProduceVerifyOutput(qcms_transform_data_rgba_out_lut_neon)); +// } +//#endif // Verify BGRA transforms. ASSERT_TRUE(SetBuffers(QCMS_DATA_BGRA_8)); @@ -543,11 +543,11 @@ void GfxQcms_ProfilePairBase::TransformPrecachePlatformExt() { EXPECT_TRUE(ProduceVerifyOutput(qcms_transform_data_bgra_out_lut_avx)); } #endif -#ifdef MOZILLA_MAY_SUPPORT_NEON - if (mozilla::supports_neon()) { - EXPECT_TRUE(ProduceVerifyOutput(qcms_transform_data_bgra_out_lut_neon)); - } -#endif +//#ifdef MOZILLA_MAY_SUPPORT_NEON +// if (mozilla::supports_neon()) { +// EXPECT_TRUE(ProduceVerifyOutput(qcms_transform_data_bgra_out_lut_neon)); +// } +//#endif } class GfxQcms_sRGB_To_sRGB : public GfxQcms_ProfilePairBase { -- 2.30.2