summarylogtreecommitdiffstats
path: root/040-libjpeg-xl-git-disable-avx2.patch
diff options
context:
space:
mode:
authorDaniel Bermond2020-03-02 01:04:51 +0000
committerDaniel Bermond2020-03-02 01:04:51 +0000
commita702413c4316954b0e767651040fe5cd73378d0d (patch)
tree4b498b422eeaa1394b2ec0da0eb9c878a5a33441 /040-libjpeg-xl-git-disable-avx2.patch
parentf76d30045f81718c7d3672ce11f451bab93dfd1b (diff)
downloadaur-a702413c4316954b0e767651040fe5cd73378d0d.tar.gz
Match upstream changes. Disable AVX2. Add benchmark tool.
Diffstat (limited to '040-libjpeg-xl-git-disable-avx2.patch')
-rw-r--r--040-libjpeg-xl-git-disable-avx2.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/040-libjpeg-xl-git-disable-avx2.patch b/040-libjpeg-xl-git-disable-avx2.patch
new file mode 100644
index 000000000000..39b6517e3436
--- /dev/null
+++ b/040-libjpeg-xl-git-disable-avx2.patch
@@ -0,0 +1,33 @@
+diff -Naupr a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2020-03-01 20:39:57.000000000 +0000
++++ b/CMakeLists.txt 2020-03-01 23:39:56.619280694 +0000
+@@ -134,16 +134,7 @@ else()
+ endif()
+
+ # CPU flags
+-if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64|AMD64" AND NOT MSVC)
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
+- -mavx2 \
+- -mfma \
+- -Xclang -mprefer-vector-width=128 \
+- -Xclang -target-cpu -Xclang haswell \
+- -Xclang -target-feature -Xclang +avx2")
+-elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64|AMD64" AND MSVC)
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:AVX2")
+-elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64")
++if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
+ -Xclang -mprefer-vector-width=128 \
+ -Xclang -target-cpu -Xclang cortex-a72")
+diff -Naupr a/third_party/highway/hwy/targets.h b/third_party/highway/hwy/targets.h
+--- a/third_party/highway/hwy/targets.h 2020-03-01 20:30:01.000000000 +0000
++++ b/third_party/highway/hwy/targets.h 2020-03-01 20:32:10.234611054 +0000
+@@ -25,7 +25,7 @@
+ #define HWY_WASM 32
+
+ // Uncomment to avoid using/requiring AVX2 when running on Intel/AMD.
+-// #define HWY_DISABLE_AVX2
++#define HWY_DISABLE_AVX2
+
+ // Uncomment to avoid additional (optional) code generation for AVX-512 when
+ // building for Intel/AMD.