diff --git a/Makefile b/Makefile index d8e5800..42a9249 100644 --- a/Makefile +++ b/Makefile @@ -42,6 +42,7 @@ build/collect: --add-data "./events/clx.txt:." \ --add-data "./events/clx_aws.txt:." \ --add-data "./events/icx.txt:." \ + --add-data "./events/icx_aws.txt:." \ --add-binary "../build/pmu-checker:." \ --runtime-tmpdir . cp $(TMPDIR)/dist/$(BINARY_COLLECT) build/ diff --git a/Makefile_non_container b/Makefile_non_container index 33573ac..9e3e5d9 100644 --- a/Makefile_non_container +++ b/Makefile_non_container @@ -38,6 +38,7 @@ build/collect: --add-data "./events/clx.txt:." \ --add-data "./events/clx_aws.txt:." \ --add-data "./events/icx.txt:." \ + --add-data "./events/icx_aws.txt:." \ --add-binary "./build/pmu-checker:." \ --runtime-tmpdir . rm -rf build/$(BINARY_COLLECT) diff --git a/perf-collect.py b/perf-collect.py index 41e5062..f77c39c 100644 --- a/perf-collect.py +++ b/perf-collect.py @@ -245,6 +245,8 @@ def is_safe_file(fname, substr): eventfile = "clx_aws.txt" elif arch == "icelake": eventfile = "icx.txt" + if args.cloud in ("aws", "AWS") and args.cloudtype in ("VM", "vm"): + eventfile = "icx_aws.txt" else: raise SystemExit( "Unsupported architecture (currently supports Broadwell, Skylake, CascadeLake and Icelake Intel Xeon processors)"