Update rest of the csproj files

dotnet · Aug 3, 2024 · 376ff48 · 376ff48
1 parent 86b37de
commit 376ff48
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 45 deletions.
diff --git a/src/tests/nativeaot/SmokeTests/HardwareIntrinsics/X64Avx.csproj b/src/tests/nativeaot/SmokeTests/HardwareIntrinsics/X64Avx.csproj
@@ -18,19 +18,9 @@
   <PropertyGroup>
     <CLRTestBashPreCommands><![CDATA[
 $(CLRTestBashPreCommands)
-    if [[ "$OSTYPE" == "darwin"* ]]; then
-        sysctl -a
-        sysctl -a | grep machdep.cpu.leaf7_features | grep AVX >/dev/null
-        if [ $? -ne 0 ]; then
-          echo No support for AVX, test not applicable.
-          exit 0
-        fi
-    fi
-    if [[ "$OSTYPE" == "linux"* ]]; then
-        if ! grep -q '^flags.*avx' /proc/cpuinfo 2>/dev/null; then
-          echo No support for AVX, test not applicable.
-          exit 0
-        fi
+    if ! cc -dM -E -march=native - < /dev/null 2>/dev/null | grep -q __AVX__; then
+      echo No support for AVX, test not applicable.
+      exit 0
     fi
 ]]></CLRTestBashPreCommands>
   </PropertyGroup>

diff --git a/src/tests/nativeaot/SmokeTests/HardwareIntrinsics/X64Avx2.csproj b/src/tests/nativeaot/SmokeTests/HardwareIntrinsics/X64Avx2.csproj
@@ -18,20 +18,9 @@
   <PropertyGroup>
     <CLRTestBashPreCommands><![CDATA[
 $(CLRTestBashPreCommands)
-    if [[ "$OSTYPE" == "darwin"* ]]; then
-        sysctl -a
-
-        sysctl -a | grep machdep.cpu.leaf7_features | grep AVX2 >/dev/null
-        if [ $? -ne 0 ]; then
-          echo No support for AVX2, test not applicable.
-          exit 0
-        fi
-    fi
-    if [[ "$OSTYPE" == "linux"* ]]; then
-        if ! grep -q '^flags.*avx2' /proc/cpuinfo 2>/dev/null; then
-          echo No support for AVX2, test not applicable.
-          exit 0
-        fi
+    if ! cc -dM -E -march=native - < /dev/null 2>/dev/null | grep -q __AVX2__; then
+      echo No support for AVX2, test not applicable.
+      exit 0
     fi
 ]]></CLRTestBashPreCommands>
   </PropertyGroup>

diff --git a/src/tests/nativeaot/SmokeTests/HardwareIntrinsics/X64Avx512.csproj b/src/tests/nativeaot/SmokeTests/HardwareIntrinsics/X64Avx512.csproj
@@ -18,11 +18,9 @@
   <PropertyGroup>
     <CLRTestBashPreCommands><![CDATA[
 $(CLRTestBashPreCommands)
-    if [[ "$OSTYPE" == "linux"* ]]; then
-        if ! grep -q '^flags.*avx512' /proc/cpuinfo 2>/dev/null; then
-          echo No support for AVX512, test not applicable.
-          exit 0
-        fi
+    if ! cc -dM -E -march=native - < /dev/null 2>/dev/null | grep -q __AVX512; then
+      echo No support for AVX512, test not applicable.
+      exit 0
     fi
 ]]></CLRTestBashPreCommands>
   </PropertyGroup>

diff --git a/src/tests/nativeaot/SmokeTests/HardwareIntrinsics/X64Avx_NoAvx2.csproj b/src/tests/nativeaot/SmokeTests/HardwareIntrinsics/X64Avx_NoAvx2.csproj
@@ -18,19 +18,9 @@
   <PropertyGroup>
     <CLRTestBashPreCommands><![CDATA[
 $(CLRTestBashPreCommands)
-    if [[ "$OSTYPE" == "darwin"* ]]; then
-        sysctl -a
-        sysctl -a | grep machdep.cpu.leaf7_features | grep AVX >/dev/null
-        if [ $? -ne 0 ]; then
-          echo No support for AVX, test not applicable.
-          exit 0
-        fi
-    fi
-    if [[ "$OSTYPE" == "linux"* ]]; then
-        if ! grep -q '^flags.*avx' /proc/cpuinfo 2>/dev/null; then
-          echo No support for AVX, test not applicable.
-          exit 0
-        fi
+    if ! cc -dM -E -march=native - < /dev/null 2>/dev/null | grep -q __AVX__; then
+      echo No support for AVX, test not applicable.
+      exit 0
     fi
 ]]></CLRTestBashPreCommands>
   </PropertyGroup>