Upstream merge 55

mlir/utils/performance/parameterSweeps.py

@@ -21,7 +21,7 @@
 from typing import Callable, Iterable, List, Sequence, Optional, Tuple, TypeVar, Union
 
 import perfRunner
-from perfRunner import Paths, ConvConfiguration, getArch, getNumCU
+from perfRunner import Paths, ConvConfiguration, getArch, getNumCU, getChip
 from perfCommonUtils import CORRECT_RESULT_RE
 
 @dataclass(frozen=True)
@@ -525,7 +525,7 @@ def main() -> bool:
             print(f"""Unknown arch {arch}""", file=sys.stderr)
 
     options = Options(debug=args.debug, quiet=args.quiet,
-        arch=arch, flags=rocmlir_gen_flags, concurrent_tests=args.jobs, numCU=getNumCU(arch))
+        arch=arch, flags=rocmlir_gen_flags, concurrent_tests=args.jobs, numCU=getNumCU(getChip()))
     paths = perfRunner.create_paths(None, args.mlir_build_dir)
 
     config = args.config