toplev: More github runner fixes

andikleen · Nov 17, 2023 · 621ebf9 · 621ebf9
1 parent 1677937
commit 621ebf9
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/toplev.py b/toplev.py
@@ -974,7 +974,7 @@ def run_parallel(args, env):
 def gen_cpu_name(cpu):
     if cpu == "simple":
         c = event_download.get_cpustr()
-        if not c.startswith("GenuineIntel"): # fix my github runner
+        if not c.startswith("GenuineIntel"): # fix github runner
             c = "GenuineIntel-6-4E"
         return c
     if cpu == "sprmax":
@@ -999,11 +999,10 @@ def gen_cpu_name(cpu):
 if args.force_cpu:
     env.forcecpu = args.force_cpu
     cpuname = gen_cpu_name(args.force_cpu)
-    if args.force_cpu != "simple":
-        if not os.getenv("EVENTMAP"):
-            os.environ["EVENTMAP"] = cpuname
-        if not os.getenv("UNCORE"):
-            os.environ["UNCORE"] = cpuname
+    if not os.getenv("EVENTMAP"):
+        os.environ["EVENTMAP"] = cpuname
+    if not os.getenv("UNCORE"):
+        os.environ["UNCORE"] = cpuname
 if args.force_topology:
     if not os.getenv("TOPOLOGY"):
         os.environ["TOPOLOGY"] = args.force_topology