From 621ebf98e6289c8620b26647d2e86b95a1b7a462 Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Thu, 16 Nov 2023 16:13:04 -0800 Subject: [PATCH] toplev: More github runner fixes --- toplev.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/toplev.py b/toplev.py index 0ab451ee..a93246e2 100755 --- 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