Revert "WIP: Run two tests with KMP_TOPOLOGY_METHOD=cpuinfo for GHA runners"

This reverts commit ce3da50.

Author: mstorsjo

openmp/runtime/test/affinity/kmp-affinity.c

@@ -1,7 +1,7 @@
 // RUN: %libomp-compile -D_GNU_SOURCE
-// RUN: env KMP_AFFINITY=granularity=thread,compact KMP_TOPOLOGY_METHOD=cpuinfo %libomp-run
-// RUN: env KMP_AFFINITY=granularity=core,compact KMP_TOPOLOGY_METHOD=cpuinfo %libomp-run
-// RUN: env KMP_AFFINITY=granularity=socket,compact KMP_TOPOLOGY_METHOD=cpuinfo %libomp-run
+// RUN: env KMP_AFFINITY=granularity=thread,compact %libomp-run
+// RUN: env KMP_AFFINITY=granularity=core,compact %libomp-run
+// RUN: env KMP_AFFINITY=granularity=socket,compact %libomp-run
 // REQUIRES: linux
 
 #include <stdio.h>

openmp/runtime/test/affinity/omp-places.c

@@ -1,7 +1,7 @@
 // RUN: %libomp-compile -D_GNU_SOURCE
-// RUN: env OMP_PLACES=threads KMP_TOPOLOGY_METHOD=cpuinfo %libomp-run
-// RUN: env OMP_PLACES=cores KMP_TOPOLOGY_METHOD=cpuinfo %libomp-run
-// RUN: env OMP_PLACES=sockets KMP_TOPOLOGY_METHOD=cpuinfo %libomp-run
+// RUN: env OMP_PLACES=threads %libomp-run
+// RUN: env OMP_PLACES=cores %libomp-run
+// RUN: env OMP_PLACES=sockets %libomp-run
 // REQUIRES: linux
 
 #include <stdio.h>