Bug 1520760 - Fix AVX2 detection to ensure we have all required CPU parameters. r=jrmuizel

Differential Revision: https://phabricator.services.mozilla.com/D16994

Author: aosmond

media/libjpeg/1520760-avx2-detection.diff

@@ -0,0 +1,32 @@
+Bug 1520760 - Fix AVX2 detection to ensure we have all required CPU parameters.
+
+diff --git simd/i386/jsimdcpu.asm simd/i386/jsimdcpu.asm
+--- simd/i386/jsimdcpu.asm
++++ simd/i386/jsimdcpu.asm
+@@ -87,8 +87,10 @@ EXTN(jpeg_simd_cpu_support):
+     mov         eax, 1
+     xor         ecx, ecx
+     cpuid
+-    test        ecx, 1<<27
++    test        ecx, 1<<26
+     jz          short .no_avx2          ; O/S does not support XSAVE
++    test        ecx, 1<<27
++    jz          short .no_avx2          ; O/S does not support OSXSAVE
+     test        ecx, 1<<28
+     jz          short .no_avx2          ; CPU does not support AVX2
+ 
+diff --git simd/x86_64/jsimdcpu.asm simd/x86_64/jsimdcpu.asm
+--- simd/x86_64/jsimdcpu.asm
++++ simd/x86_64/jsimdcpu.asm
+@@ -53,8 +53,10 @@ EXTN(jpeg_simd_cpu_support):
+     mov         rax, 1
+     xor         rcx, rcx
+     cpuid
+-    test        rcx, 1<<27
++    test        rcx, 1<<26
+     jz          short .return           ; O/S does not support XSAVE
++    test        rcx, 1<<27
++    jz          short .return           ; O/S does not support OSXSAVE
+     test        rcx, 1<<28
+     jz          short .return           ; CPU does not support AVX2
+ 

media/libjpeg/simd/i386/jsimdcpu.asm

@@ -87,8 +87,10 @@ EXTN(jpeg_simd_cpu_support):
     mov         eax, 1
     xor         ecx, ecx
     cpuid
-    test        ecx, 1<<27
+    test        ecx, 1<<26
     jz          short .no_avx2          ; O/S does not support XSAVE
+    test        ecx, 1<<27
+    jz          short .no_avx2          ; O/S does not support OSXSAVE
     test        ecx, 1<<28
     jz          short .no_avx2          ; CPU does not support AVX2
 

media/libjpeg/simd/x86_64/jsimdcpu.asm

@@ -53,8 +53,10 @@ EXTN(jpeg_simd_cpu_support):
     mov         rax, 1
     xor         rcx, rcx
     cpuid
-    test        rcx, 1<<27
+    test        rcx, 1<<26
     jz          short .return           ; O/S does not support XSAVE
+    test        rcx, 1<<27
+    jz          short .return           ; O/S does not support OSXSAVE
     test        rcx, 1<<28
     jz          short .return           ; CPU does not support AVX2
 

media/update-libjpeg.sh

@@ -19,7 +19,7 @@ tag=${2-HEAD}
 cd $srcdir/libjpeg
 cp win/jsimdcfg.inc simd/
 
-revert_files="1050342.diff assembly-tables.diff externalize-table.diff jconfig.h jconfigint.h jpeg_nbits_table.c moz.build MOZCHANGES mozilla.diff simd/jsimdcfg.inc"
+revert_files="1050342.diff assembly-tables.diff externalize-table.diff 1520760-avx2-detection.diff jconfig.h jconfigint.h jpeg_nbits_table.c moz.build MOZCHANGES mozilla.diff simd/jsimdcfg.inc"
 if test -d ${topsrcdir}/.hg; then
     hg revert --no-backup $revert_files
 elif test -d ${topsrcdir}/.git; then
@@ -30,3 +30,4 @@ patch -p0 -i mozilla.diff
 patch -p0 -i 1050342.diff
 patch -p3 -i externalize-table.diff
 patch -p3 -i assembly-tables.diff
+patch -p0 -i 1520760-avx2-detection.diff