diff --git a/src/VirtualClient/VirtualClient.Main/profiles/PERF-SPECCPU-FPRATE.json b/src/VirtualClient/VirtualClient.Main/profiles/PERF-SPECCPU-FPRATE.json index 852da775b1..9ff9b81cf5 100644 --- a/src/VirtualClient/VirtualClient.Main/profiles/PERF-SPECCPU-FPRATE.json +++ b/src/VirtualClient/VirtualClient.Main/profiles/PERF-SPECCPU-FPRATE.json @@ -10,7 +10,7 @@ "RecommendedMinimumExecutionTime": "(4-cores)=02:00:00,(16-cores)=05:00:00,(64-cores)=10:00:00", "SupportedPlatforms": "linux-x64,linux-arm64,win-x64,win-arm64", "SupportedOperatingSystems": "Azure Linux,CentOS,Debian,RedHat,Suse,Ubuntu,Windows", - "Notes": "Using a private package 'speccpu.2017.1.1.9-danielbowers.zip' to enable support for speccpu on Ubuntu 24", + "Notes": "Using a private package 'speccpu.2017.1.1.9-danielbowers.zip' to enable support for speccpu on Ubuntu 24. SPEC CPU 2017 was not initially designed for win-arm64.", "Limitations": "The following benchmarks don't work on Windows: 507, 511, 521, 526, 527, 538" }, "Parameters": { @@ -19,7 +19,6 @@ "RunPeak": false, "Threads": "{LogicalCoreCount}", "Copies": "{LogicalCoreCount}", - "Benchmarks": "{calculate(\"{Platform}\".StartsWith(\"linux\") ? \"fprate\" : \"503 508 510 519 544 549 554\")}", "BaseOptimizingFlags": "-g -O3 -march={calculate(\"{Architecture}\" == \"x64\" ? \"native\" : \"armv8-a\")} -frecord-gcc-switches", "PeakOptimizingFlags": "-g -Ofast -march={calculate(\"{Architecture}\" == \"x64\" ? \"native\" : \"armv8-a\")} -flto -frecord-gcc-switches" }, @@ -27,10 +26,196 @@ { "Type": "SpecCpuExecutor", "Parameters": { - "Scenario": "ExecuteSPECBenchmark", + "Scenario": "benchmark_503.bwaves_r", "Iterations": "$.Parameters.Iterations", "SpecProfile": "fprate", - "Benchmarks": "$.Parameters.Benchmarks", + "Benchmarks": "503", + "PackageName": "speccpu2017", + "RunPeak": "$.Parameters.RunPeak", + "Threads": "$.Parameters.Threads", + "Copies": "$.Parameters.Copies", + "BaseOptimizingFlags": "$.Parameters.BaseOptimizingFlags", + "PeakOptimizingFlags": "$.Parameters.PeakOptimizingFlags" + } + }, + { + "Type": "SpecCpuExecutor", + "Parameters": { + "Scenario": "benchmark_507.cactuBSSN_r", + "Iterations": "$.Parameters.Iterations", + "SpecProfile": "fprate", + "Benchmarks": "507", + "PackageName": "speccpu2017", + "RunPeak": "$.Parameters.RunPeak", + "Threads": "$.Parameters.Threads", + "Copies": "$.Parameters.Copies", + "BaseOptimizingFlags": "$.Parameters.BaseOptimizingFlags", + "PeakOptimizingFlags": "$.Parameters.PeakOptimizingFlags", + "SupportedPlatforms": "linux-x64,linux-arm64" + } + }, + { + "Type": "SpecCpuExecutor", + "Parameters": { + "Scenario": "benchmark_508.namd_r", + "Iterations": "$.Parameters.Iterations", + "SpecProfile": "fprate", + "Benchmarks": "508", + "PackageName": "speccpu2017", + "RunPeak": "$.Parameters.RunPeak", + "Threads": "$.Parameters.Threads", + "Copies": "$.Parameters.Copies", + "BaseOptimizingFlags": "$.Parameters.BaseOptimizingFlags", + "PeakOptimizingFlags": "$.Parameters.PeakOptimizingFlags" + } + }, + { + "Type": "SpecCpuExecutor", + "Parameters": { + "Scenario": "benchmark_510.parest_r", + "Iterations": "$.Parameters.Iterations", + "SpecProfile": "fprate", + "Benchmarks": "510", + "PackageName": "speccpu2017", + "RunPeak": "$.Parameters.RunPeak", + "Threads": "$.Parameters.Threads", + "Copies": "$.Parameters.Copies", + "BaseOptimizingFlags": "$.Parameters.BaseOptimizingFlags", + "PeakOptimizingFlags": "$.Parameters.PeakOptimizingFlags" + } + }, + { + "Type": "SpecCpuExecutor", + "Parameters": { + "Scenario": "benchmark_511.povray_r", + "Iterations": "$.Parameters.Iterations", + "SpecProfile": "fprate", + "Benchmarks": "511", + "PackageName": "speccpu2017", + "RunPeak": "$.Parameters.RunPeak", + "Threads": "$.Parameters.Threads", + "Copies": "$.Parameters.Copies", + "BaseOptimizingFlags": "$.Parameters.BaseOptimizingFlags", + "PeakOptimizingFlags": "$.Parameters.PeakOptimizingFlags", + "SupportedPlatforms": "linux-x64,linux-arm64" + } + }, + { + "Type": "SpecCpuExecutor", + "Parameters": { + "Scenario": "benchmark_519.lbm_r", + "Iterations": "$.Parameters.Iterations", + "SpecProfile": "fprate", + "Benchmarks": "519", + "PackageName": "speccpu2017", + "RunPeak": "$.Parameters.RunPeak", + "Threads": "$.Parameters.Threads", + "Copies": "$.Parameters.Copies", + "BaseOptimizingFlags": "$.Parameters.BaseOptimizingFlags", + "PeakOptimizingFlags": "$.Parameters.PeakOptimizingFlags" + } + }, + { + "Type": "SpecCpuExecutor", + "Parameters": { + "Scenario": "benchmark_521.wrf_r", + "Iterations": "$.Parameters.Iterations", + "SpecProfile": "fprate", + "Benchmarks": "521", + "PackageName": "speccpu2017", + "RunPeak": "$.Parameters.RunPeak", + "Threads": "$.Parameters.Threads", + "Copies": "$.Parameters.Copies", + "BaseOptimizingFlags": "$.Parameters.BaseOptimizingFlags", + "PeakOptimizingFlags": "$.Parameters.PeakOptimizingFlags", + "SupportedPlatforms": "linux-x64,linux-arm64" + } + }, + { + "Type": "SpecCpuExecutor", + "Parameters": { + "Scenario": "benchmark_526.blender_r", + "Iterations": "$.Parameters.Iterations", + "SpecProfile": "fprate", + "Benchmarks": "526", + "PackageName": "speccpu2017", + "RunPeak": "$.Parameters.RunPeak", + "Threads": "$.Parameters.Threads", + "Copies": "$.Parameters.Copies", + "BaseOptimizingFlags": "$.Parameters.BaseOptimizingFlags", + "PeakOptimizingFlags": "$.Parameters.PeakOptimizingFlags", + "SupportedPlatforms": "linux-x64,linux-arm64" + } + }, + { + "Type": "SpecCpuExecutor", + "Parameters": { + "Scenario": "benchmark_527.cam4_r", + "Iterations": "$.Parameters.Iterations", + "SpecProfile": "fprate", + "Benchmarks": "527", + "PackageName": "speccpu2017", + "RunPeak": "$.Parameters.RunPeak", + "Threads": "$.Parameters.Threads", + "Copies": "$.Parameters.Copies", + "BaseOptimizingFlags": "$.Parameters.BaseOptimizingFlags", + "PeakOptimizingFlags": "$.Parameters.PeakOptimizingFlags", + "SupportedPlatforms": "linux-x64,linux-arm64" + } + }, + { + "Type": "SpecCpuExecutor", + "Parameters": { + "Scenario": "benchmark_538.imagick_r", + "Iterations": "$.Parameters.Iterations", + "SpecProfile": "fprate", + "Benchmarks": "538", + "PackageName": "speccpu2017", + "RunPeak": "$.Parameters.RunPeak", + "Threads": "$.Parameters.Threads", + "Copies": "$.Parameters.Copies", + "BaseOptimizingFlags": "$.Parameters.BaseOptimizingFlags", + "PeakOptimizingFlags": "$.Parameters.PeakOptimizingFlags", + "SupportedPlatforms": "linux-x64,linux-arm64" + } + }, + { + "Type": "SpecCpuExecutor", + "Parameters": { + "Scenario": "benchmark_544.nab_r", + "Iterations": "$.Parameters.Iterations", + "SpecProfile": "fprate", + "Benchmarks": "544", + "PackageName": "speccpu2017", + "RunPeak": "$.Parameters.RunPeak", + "Threads": "$.Parameters.Threads", + "Copies": "$.Parameters.Copies", + "BaseOptimizingFlags": "$.Parameters.BaseOptimizingFlags", + "PeakOptimizingFlags": "$.Parameters.PeakOptimizingFlags" + } + }, + { + "Type": "SpecCpuExecutor", + "Parameters": { + "Scenario": "benchmark_549.fotonik3d_r", + "Iterations": "$.Parameters.Iterations", + "SpecProfile": "fprate", + "Benchmarks": "549", + "PackageName": "speccpu2017", + "RunPeak": "$.Parameters.RunPeak", + "Threads": "$.Parameters.Threads", + "Copies": "$.Parameters.Copies", + "BaseOptimizingFlags": "$.Parameters.BaseOptimizingFlags", + "PeakOptimizingFlags": "$.Parameters.PeakOptimizingFlags" + } + }, + { + "Type": "SpecCpuExecutor", + "Parameters": { + "Scenario": "benchmark_554.roms_r", + "Iterations": "$.Parameters.Iterations", + "SpecProfile": "fprate", + "Benchmarks": "554", "PackageName": "speccpu2017", "RunPeak": "$.Parameters.RunPeak", "Threads": "$.Parameters.Threads", @@ -46,7 +231,7 @@ "Parameters": { "Scenario": "MaskAptDailyTimers", "SupportedPlatforms": "linux-x64,linux-arm64", - "Command": "bash -c 'systemctl mask apt-daily.timer apt-daily-upgrade.timer apt-daily.service apt-daily-upgrade.service; systemctl stop apt-daily.timer apt-daily-upgrade.timer apt-daily.service apt-daily-upgrade.service; exit 0'" + "Command": "bash -c \"systemctl mask apt-daily.timer apt-daily-upgrade.timer apt-daily.service apt-daily-upgrade.service; systemctl stop apt-daily.timer apt-daily-upgrade.timer apt-daily.service apt-daily-upgrade.service; exit 0\"" } }, { diff --git a/src/VirtualClient/VirtualClient.Main/profiles/PERF-SPECCPU-FPSPEED.json b/src/VirtualClient/VirtualClient.Main/profiles/PERF-SPECCPU-FPSPEED.json index 9104d251c9..9a8de1eee1 100644 --- a/src/VirtualClient/VirtualClient.Main/profiles/PERF-SPECCPU-FPSPEED.json +++ b/src/VirtualClient/VirtualClient.Main/profiles/PERF-SPECCPU-FPSPEED.json @@ -8,9 +8,9 @@ }, "Metadata": { "RecommendedMinimumExecutionTime": "(4-cores)=02:00:00,(16-cores)=06:00:00,(64-cores)=12:00:00", - "SupportedPlatforms": "linux-x64,linux-arm64,win-x64,win-arm64", + "SupportedPlatforms": "linux-x64,linux-arm64,win-x64", "SupportedOperatingSystems": "Azure Linux,CentOS,Debian,RedHat,Suse,Ubuntu,Windows", - "Notes": "Using a private package 'speccpu.2017.1.1.9-danielbowers.zip' to enable support for speccpu on Ubuntu 24", + "Notes": "Using a private package 'speccpu.2017.1.1.9-danielbowers.zip' to enable support for speccpu on Ubuntu 24. SPEC CPU 2017 was not initially designed for win-arm64.", "Limitations": "The following benchmarks don't work on Windows: 607, 621, 627, 628, 638, 649" }, "Parameters": { @@ -19,7 +19,6 @@ "RunPeak": false, "Threads": "{LogicalCoreCount}", "Copies": "{LogicalCoreCount}", - "Benchmarks": "{calculate(\"{Platform}\".StartsWith(\"linux\") ? \"fpspeed\" : \"603 619 644 654\")}", "BaseOptimizingFlags": "-g -O3 -march={calculate(\"{Architecture}\" == \"x64\" ? \"native\" : \"armv8-a\")} -frecord-gcc-switches", "PeakOptimizingFlags": "-g -Ofast -march={calculate(\"{Architecture}\" == \"x64\" ? \"native\" : \"armv8-a\")} -flto -frecord-gcc-switches" }, @@ -27,10 +26,151 @@ { "Type": "SpecCpuExecutor", "Parameters": { - "Scenario": "ExecuteSPECBenchmark", + "Scenario": "benchmark_603.bwaves_s", "Iterations": "$.Parameters.Iterations", "SpecProfile": "fpspeed", - "Benchmarks": "$.Parameters.Benchmarks", + "Benchmarks": "603", + "PackageName": "speccpu2017", + "RunPeak": "$.Parameters.RunPeak", + "Threads": "$.Parameters.Threads", + "Copies": "$.Parameters.Copies", + "BaseOptimizingFlags": "$.Parameters.BaseOptimizingFlags", + "PeakOptimizingFlags": "$.Parameters.PeakOptimizingFlags" + } + }, + { + "Type": "SpecCpuExecutor", + "Parameters": { + "Scenario": "benchmark_607.cactuBSSN_s", + "Iterations": "$.Parameters.Iterations", + "SpecProfile": "fpspeed", + "Benchmarks": "607", + "PackageName": "speccpu2017", + "RunPeak": "$.Parameters.RunPeak", + "Threads": "$.Parameters.Threads", + "Copies": "$.Parameters.Copies", + "BaseOptimizingFlags": "$.Parameters.BaseOptimizingFlags", + "PeakOptimizingFlags": "$.Parameters.PeakOptimizingFlags", + "SupportedPlatforms": "linux-x64,linux-arm64" + } + }, + { + "Type": "SpecCpuExecutor", + "Parameters": { + "Scenario": "benchmark_619.lbm_s", + "Iterations": "$.Parameters.Iterations", + "SpecProfile": "fpspeed", + "Benchmarks": "619", + "PackageName": "speccpu2017", + "RunPeak": "$.Parameters.RunPeak", + "Threads": "$.Parameters.Threads", + "Copies": "$.Parameters.Copies", + "BaseOptimizingFlags": "$.Parameters.BaseOptimizingFlags", + "PeakOptimizingFlags": "$.Parameters.PeakOptimizingFlags" + } + }, + { + "Type": "SpecCpuExecutor", + "Parameters": { + "Scenario": "benchmark_621.wrf_s", + "Iterations": "$.Parameters.Iterations", + "SpecProfile": "fpspeed", + "Benchmarks": "621", + "PackageName": "speccpu2017", + "RunPeak": "$.Parameters.RunPeak", + "Threads": "$.Parameters.Threads", + "Copies": "$.Parameters.Copies", + "BaseOptimizingFlags": "$.Parameters.BaseOptimizingFlags", + "PeakOptimizingFlags": "$.Parameters.PeakOptimizingFlags", + "SupportedPlatforms": "linux-x64,linux-arm64" + } + }, + { + "Type": "SpecCpuExecutor", + "Parameters": { + "Scenario": "benchmark_627.cam4_s", + "Iterations": "$.Parameters.Iterations", + "SpecProfile": "fpspeed", + "Benchmarks": "627", + "PackageName": "speccpu2017", + "RunPeak": "$.Parameters.RunPeak", + "Threads": "$.Parameters.Threads", + "Copies": "$.Parameters.Copies", + "BaseOptimizingFlags": "$.Parameters.BaseOptimizingFlags", + "PeakOptimizingFlags": "$.Parameters.PeakOptimizingFlags", + "SupportedPlatforms": "linux-x64,linux-arm64" + } + }, + { + "Type": "SpecCpuExecutor", + "Parameters": { + "Scenario": "benchmark_628.pop2_s", + "Iterations": "$.Parameters.Iterations", + "SpecProfile": "fpspeed", + "Benchmarks": "628", + "PackageName": "speccpu2017", + "RunPeak": "$.Parameters.RunPeak", + "Threads": "$.Parameters.Threads", + "Copies": "$.Parameters.Copies", + "BaseOptimizingFlags": "$.Parameters.BaseOptimizingFlags", + "PeakOptimizingFlags": "$.Parameters.PeakOptimizingFlags", + "SupportedPlatforms": "linux-x64,linux-arm64" + } + }, + { + "Type": "SpecCpuExecutor", + "Parameters": { + "Scenario": "benchmark_638.imagick_s", + "Iterations": "$.Parameters.Iterations", + "SpecProfile": "fpspeed", + "Benchmarks": "638", + "PackageName": "speccpu2017", + "RunPeak": "$.Parameters.RunPeak", + "Threads": "$.Parameters.Threads", + "Copies": "$.Parameters.Copies", + "BaseOptimizingFlags": "$.Parameters.BaseOptimizingFlags", + "PeakOptimizingFlags": "$.Parameters.PeakOptimizingFlags", + "SupportedPlatforms": "linux-x64,linux-arm64" + } + }, + { + "Type": "SpecCpuExecutor", + "Parameters": { + "Scenario": "benchmark_644.nab_s", + "Iterations": "$.Parameters.Iterations", + "SpecProfile": "fpspeed", + "Benchmarks": "644", + "PackageName": "speccpu2017", + "RunPeak": "$.Parameters.RunPeak", + "Threads": "$.Parameters.Threads", + "Copies": "$.Parameters.Copies", + "BaseOptimizingFlags": "$.Parameters.BaseOptimizingFlags", + "PeakOptimizingFlags": "$.Parameters.PeakOptimizingFlags" + } + }, + { + "Type": "SpecCpuExecutor", + "Parameters": { + "Scenario": "benchmark_649.fotonik3d_s", + "Iterations": "$.Parameters.Iterations", + "SpecProfile": "fpspeed", + "Benchmarks": "649", + "PackageName": "speccpu2017", + "RunPeak": "$.Parameters.RunPeak", + "Threads": "$.Parameters.Threads", + "Copies": "$.Parameters.Copies", + "BaseOptimizingFlags": "$.Parameters.BaseOptimizingFlags", + "PeakOptimizingFlags": "$.Parameters.PeakOptimizingFlags", + "SupportedPlatforms": "linux-x64,linux-arm64" + } + }, + { + "Type": "SpecCpuExecutor", + "Parameters": { + "Scenario": "benchmark_654.roms_s", + "Iterations": "$.Parameters.Iterations", + "SpecProfile": "fpspeed", + "Benchmarks": "654", "PackageName": "speccpu2017", "RunPeak": "$.Parameters.RunPeak", "Threads": "$.Parameters.Threads", @@ -46,7 +186,7 @@ "Parameters": { "Scenario": "MaskAptDailyTimers", "SupportedPlatforms": "linux-x64,linux-arm64", - "Command": "bash -c 'systemctl mask apt-daily.timer apt-daily-upgrade.timer apt-daily.service apt-daily-upgrade.service; systemctl stop apt-daily.timer apt-daily-upgrade.timer apt-daily.service apt-daily-upgrade.service; exit 0'" + "Command": "bash -c \"systemctl mask apt-daily.timer apt-daily-upgrade.timer apt-daily.service apt-daily-upgrade.service; systemctl stop apt-daily.timer apt-daily-upgrade.timer apt-daily.service apt-daily-upgrade.service; exit 0\"" } }, { diff --git a/src/VirtualClient/VirtualClient.Main/profiles/PERF-SPECCPU-INTRATE.json b/src/VirtualClient/VirtualClient.Main/profiles/PERF-SPECCPU-INTRATE.json index 13d7844874..8c809a07ab 100644 --- a/src/VirtualClient/VirtualClient.Main/profiles/PERF-SPECCPU-INTRATE.json +++ b/src/VirtualClient/VirtualClient.Main/profiles/PERF-SPECCPU-INTRATE.json @@ -8,9 +8,9 @@ }, "Metadata": { "RecommendedMinimumExecutionTime": "(8-cores)=04:00:00,(16-cores)=08:00:00,(64-cores)=10:00:00", - "SupportedPlatforms": "linux-x64,linux-arm64,win-x64,win-arm64", + "SupportedPlatforms": "linux-x64,linux-arm64,win-x64", "SupportedOperatingSystems": "Azure Linux,CentOS,Debian,RedHat,Suse,Ubuntu,Windows", - "Notes": "Using a private package 'speccpu.2017.1.1.9-danielbowers.zip' to enable support for speccpu on Ubuntu 24", + "Notes": "Using a private package 'speccpu.2017.1.1.9-danielbowers.zip' to enable support for speccpu on Ubuntu 24. SPEC CPU 2017 was not initially designed for win-arm64.", "Limitations": "The following benchmarks don't work on Windows: 500, 502, 520, 523, 531" }, "Parameters": { @@ -19,7 +19,6 @@ "RunPeak": false, "Threads": "{LogicalCoreCount}", "Copies": "{LogicalCoreCount}", - "Benchmarks": "{calculate(\"{Platform}\".StartsWith(\"linux\") ? \"intrate\" : \"505 525 541 548 557\")}", "BaseOptimizingFlags": "-g -O3 -march={calculate(\"{Architecture}\" == \"x64\" ? \"native\" : \"armv8-a\")} -frecord-gcc-switches", "PeakOptimizingFlags": "-g -Ofast -march={calculate(\"{Architecture}\" == \"x64\" ? \"native\" : \"armv8-a\")} -flto -frecord-gcc-switches" }, @@ -27,10 +26,150 @@ { "Type": "SpecCpuExecutor", "Parameters": { - "Scenario": "ExecuteSPECBenchmark", + "Scenario": "benchmark_500.perlbench_r", "Iterations": "$.Parameters.Iterations", "SpecProfile": "intrate", - "Benchmarks": "$.Parameters.Benchmarks", + "Benchmarks": "500", + "PackageName": "speccpu2017", + "RunPeak": "$.Parameters.RunPeak", + "Threads": "$.Parameters.Threads", + "Copies": "$.Parameters.Copies", + "BaseOptimizingFlags": "$.Parameters.BaseOptimizingFlags", + "PeakOptimizingFlags": "$.Parameters.PeakOptimizingFlags", + "SupportedPlatforms": "linux-x64,linux-arm64" + } + }, + { + "Type": "SpecCpuExecutor", + "Parameters": { + "Scenario": "benchmark_502.gcc_r", + "Iterations": "$.Parameters.Iterations", + "SpecProfile": "intrate", + "Benchmarks": "502", + "PackageName": "speccpu2017", + "RunPeak": "$.Parameters.RunPeak", + "Threads": "$.Parameters.Threads", + "Copies": "$.Parameters.Copies", + "BaseOptimizingFlags": "$.Parameters.BaseOptimizingFlags", + "PeakOptimizingFlags": "$.Parameters.PeakOptimizingFlags", + "SupportedPlatforms": "linux-x64,linux-arm64" + } + }, + { + "Type": "SpecCpuExecutor", + "Parameters": { + "Scenario": "benchmark_505.mcf_r", + "Iterations": "$.Parameters.Iterations", + "SpecProfile": "intrate", + "Benchmarks": "505", + "PackageName": "speccpu2017", + "RunPeak": "$.Parameters.RunPeak", + "Threads": "$.Parameters.Threads", + "Copies": "$.Parameters.Copies", + "BaseOptimizingFlags": "$.Parameters.BaseOptimizingFlags", + "PeakOptimizingFlags": "$.Parameters.PeakOptimizingFlags" + } + }, + { + "Type": "SpecCpuExecutor", + "Parameters": { + "Scenario": "benchmark_520.omnetpp_r", + "Iterations": "$.Parameters.Iterations", + "SpecProfile": "intrate", + "Benchmarks": "520", + "PackageName": "speccpu2017", + "RunPeak": "$.Parameters.RunPeak", + "Threads": "$.Parameters.Threads", + "Copies": "$.Parameters.Copies", + "BaseOptimizingFlags": "$.Parameters.BaseOptimizingFlags", + "PeakOptimizingFlags": "$.Parameters.PeakOptimizingFlags", + "SupportedPlatforms": "linux-x64,linux-arm64" + } + }, + { + "Type": "SpecCpuExecutor", + "Parameters": { + "Scenario": "benchmark_523.xalancbmk_r", + "Iterations": "$.Parameters.Iterations", + "SpecProfile": "intrate", + "Benchmarks": "523", + "PackageName": "speccpu2017", + "RunPeak": "$.Parameters.RunPeak", + "Threads": "$.Parameters.Threads", + "Copies": "$.Parameters.Copies", + "BaseOptimizingFlags": "$.Parameters.BaseOptimizingFlags", + "PeakOptimizingFlags": "$.Parameters.PeakOptimizingFlags", + "SupportedPlatforms": "linux-x64,linux-arm64" + } + }, + { + "Type": "SpecCpuExecutor", + "Parameters": { + "Scenario": "benchmark_525.x264_r", + "Iterations": "$.Parameters.Iterations", + "SpecProfile": "intrate", + "Benchmarks": "525", + "PackageName": "speccpu2017", + "RunPeak": "$.Parameters.RunPeak", + "Threads": "$.Parameters.Threads", + "Copies": "$.Parameters.Copies", + "BaseOptimizingFlags": "$.Parameters.BaseOptimizingFlags", + "PeakOptimizingFlags": "$.Parameters.PeakOptimizingFlags" + } + }, + { + "Type": "SpecCpuExecutor", + "Parameters": { + "Scenario": "benchmark_531.deepsjeng_r", + "Iterations": "$.Parameters.Iterations", + "SpecProfile": "intrate", + "Benchmarks": "531", + "PackageName": "speccpu2017", + "RunPeak": "$.Parameters.RunPeak", + "Threads": "$.Parameters.Threads", + "Copies": "$.Parameters.Copies", + "BaseOptimizingFlags": "$.Parameters.BaseOptimizingFlags", + "PeakOptimizingFlags": "$.Parameters.PeakOptimizingFlags", + "SupportedPlatforms": "linux-x64,linux-arm64" + } + }, + { + "Type": "SpecCpuExecutor", + "Parameters": { + "Scenario": "benchmark_541.leela_r", + "Iterations": "$.Parameters.Iterations", + "SpecProfile": "intrate", + "Benchmarks": "541", + "PackageName": "speccpu2017", + "RunPeak": "$.Parameters.RunPeak", + "Threads": "$.Parameters.Threads", + "Copies": "$.Parameters.Copies", + "BaseOptimizingFlags": "$.Parameters.BaseOptimizingFlags", + "PeakOptimizingFlags": "$.Parameters.PeakOptimizingFlags" + } + }, + { + "Type": "SpecCpuExecutor", + "Parameters": { + "Scenario": "benchmark_548.exchange2_r", + "Iterations": "$.Parameters.Iterations", + "SpecProfile": "intrate", + "Benchmarks": "548", + "PackageName": "speccpu2017", + "RunPeak": "$.Parameters.RunPeak", + "Threads": "$.Parameters.Threads", + "Copies": "$.Parameters.Copies", + "BaseOptimizingFlags": "$.Parameters.BaseOptimizingFlags", + "PeakOptimizingFlags": "$.Parameters.PeakOptimizingFlags" + } + }, + { + "Type": "SpecCpuExecutor", + "Parameters": { + "Scenario": "benchmark_557.xz_r", + "Iterations": "$.Parameters.Iterations", + "SpecProfile": "intrate", + "Benchmarks": "557", "PackageName": "speccpu2017", "RunPeak": "$.Parameters.RunPeak", "Threads": "$.Parameters.Threads", @@ -46,7 +185,7 @@ "Parameters": { "Scenario": "MaskAptDailyTimers", "SupportedPlatforms": "linux-x64,linux-arm64", - "Command": "bash -c 'systemctl mask apt-daily.timer apt-daily-upgrade.timer apt-daily.service apt-daily-upgrade.service; systemctl stop apt-daily.timer apt-daily-upgrade.timer apt-daily.service apt-daily-upgrade.service; exit 0'" + "Command": "bash -c \"systemctl mask apt-daily.timer apt-daily-upgrade.timer apt-daily.service apt-daily-upgrade.service; systemctl stop apt-daily.timer apt-daily-upgrade.timer apt-daily.service apt-daily-upgrade.service; exit 0\"" } }, { diff --git a/src/VirtualClient/VirtualClient.Main/profiles/PERF-SPECCPU-INTSPEED.json b/src/VirtualClient/VirtualClient.Main/profiles/PERF-SPECCPU-INTSPEED.json index 5e53cca496..7f15a3e3bb 100644 --- a/src/VirtualClient/VirtualClient.Main/profiles/PERF-SPECCPU-INTSPEED.json +++ b/src/VirtualClient/VirtualClient.Main/profiles/PERF-SPECCPU-INTSPEED.json @@ -8,9 +8,9 @@ }, "Metadata": { "RecommendedMinimumExecutionTime": "(8-cores)=04:00:00,(16-cores)=06:00:00,(64-cores)=08:00:00", - "SupportedPlatforms": "linux-x64,linux-arm64,win-x64,win-arm64", + "SupportedPlatforms": "linux-x64,linux-arm64,win-x64", "SupportedOperatingSystems": "Azure Linux,CentOS,Debian,RedHat,Suse,Ubuntu,Windows", - "Notes": "Using a private package 'speccpu.2017.1.1.9-danielbowers.zip' to enable support for speccpu on Ubuntu 24", + "Notes": "Using a private package 'speccpu.2017.1.1.9-danielbowers.zip' to enable support for speccpu on Ubuntu 24. SPEC CPU 2017 was not initially designed for win-arm64.", "Limitations": "The following benchmarks don't work on Windows: 600, 602, 605, 620, 623, 625, 631, 648, 657" }, "Parameters": { @@ -19,7 +19,6 @@ "RunPeak": false, "Threads": "{LogicalCoreCount}", "Copies": "{LogicalCoreCount}", - "Benchmarks": "{calculate(\"{Platform}\".StartsWith(\"linux\") ? \"intspeed\" : \"641\")}", "BaseOptimizingFlags": "-g -O3 -march={calculate(\"{Architecture}\" == \"x64\" ? \"native\" : \"armv8-a\")} -frecord-gcc-switches", "PeakOptimizingFlags": "-g -Ofast -march={calculate(\"{Architecture}\" == \"x64\" ? \"native\" : \"armv8-a\")} -flto -frecord-gcc-switches" }, @@ -27,10 +26,122 @@ { "Type": "SpecCpuExecutor", "Parameters": { - "Scenario": "ExecuteSPECBenchmark", + "Scenario": "benchmark_600.perlbench_s", "Iterations": "$.Parameters.Iterations", "SpecProfile": "intspeed", - "Benchmarks": "$.Parameters.Benchmarks", + "Benchmarks": "600", + "PackageName": "speccpu2017", + "RunPeak": "$.Parameters.RunPeak", + "Threads": "$.Parameters.Threads", + "Copies": "$.Parameters.Copies", + "BaseOptimizingFlags": "$.Parameters.BaseOptimizingFlags", + "PeakOptimizingFlags": "$.Parameters.PeakOptimizingFlags", + "SupportedPlatforms": "linux-x64,linux-arm64" + } + }, + { + "Type": "SpecCpuExecutor", + "Parameters": { + "Scenario": "benchmark_602.gcc_s", + "Iterations": "$.Parameters.Iterations", + "SpecProfile": "intspeed", + "Benchmarks": "602", + "PackageName": "speccpu2017", + "RunPeak": "$.Parameters.RunPeak", + "Threads": "$.Parameters.Threads", + "Copies": "$.Parameters.Copies", + "BaseOptimizingFlags": "$.Parameters.BaseOptimizingFlags", + "PeakOptimizingFlags": "$.Parameters.PeakOptimizingFlags", + "SupportedPlatforms": "linux-x64,linux-arm64" + } + }, + { + "Type": "SpecCpuExecutor", + "Parameters": { + "Scenario": "benchmark_605.mcf_s", + "Iterations": "$.Parameters.Iterations", + "SpecProfile": "intspeed", + "Benchmarks": "605", + "PackageName": "speccpu2017", + "RunPeak": "$.Parameters.RunPeak", + "Threads": "$.Parameters.Threads", + "Copies": "$.Parameters.Copies", + "BaseOptimizingFlags": "$.Parameters.BaseOptimizingFlags", + "PeakOptimizingFlags": "$.Parameters.PeakOptimizingFlags", + "SupportedPlatforms": "linux-x64,linux-arm64" + } + }, + { + "Type": "SpecCpuExecutor", + "Parameters": { + "Scenario": "benchmark_620.omnetpp_s", + "Iterations": "$.Parameters.Iterations", + "SpecProfile": "intspeed", + "Benchmarks": "620", + "PackageName": "speccpu2017", + "RunPeak": "$.Parameters.RunPeak", + "Threads": "$.Parameters.Threads", + "Copies": "$.Parameters.Copies", + "BaseOptimizingFlags": "$.Parameters.BaseOptimizingFlags", + "PeakOptimizingFlags": "$.Parameters.PeakOptimizingFlags", + "SupportedPlatforms": "linux-x64,linux-arm64" + } + }, + { + "Type": "SpecCpuExecutor", + "Parameters": { + "Scenario": "benchmark_623.xalancbmk_s", + "Iterations": "$.Parameters.Iterations", + "SpecProfile": "intspeed", + "Benchmarks": "623", + "PackageName": "speccpu2017", + "RunPeak": "$.Parameters.RunPeak", + "Threads": "$.Parameters.Threads", + "Copies": "$.Parameters.Copies", + "BaseOptimizingFlags": "$.Parameters.BaseOptimizingFlags", + "PeakOptimizingFlags": "$.Parameters.PeakOptimizingFlags", + "SupportedPlatforms": "linux-x64,linux-arm64" + } + }, + { + "Type": "SpecCpuExecutor", + "Parameters": { + "Scenario": "benchmark_625.x264_s", + "Iterations": "$.Parameters.Iterations", + "SpecProfile": "intspeed", + "Benchmarks": "625", + "PackageName": "speccpu2017", + "RunPeak": "$.Parameters.RunPeak", + "Threads": "$.Parameters.Threads", + "Copies": "$.Parameters.Copies", + "BaseOptimizingFlags": "$.Parameters.BaseOptimizingFlags", + "PeakOptimizingFlags": "$.Parameters.PeakOptimizingFlags", + "SupportedPlatforms": "linux-x64,linux-arm64" + } + }, + { + "Type": "SpecCpuExecutor", + "Parameters": { + "Scenario": "benchmark_631.deepsjeng_s", + "Iterations": "$.Parameters.Iterations", + "SpecProfile": "intspeed", + "Benchmarks": "631", + "PackageName": "speccpu2017", + "RunPeak": "$.Parameters.RunPeak", + "Threads": "$.Parameters.Threads", + "Copies": "$.Parameters.Copies", + "BaseOptimizingFlags": "$.Parameters.BaseOptimizingFlags", + "PeakOptimizingFlags": "$.Parameters.PeakOptimizingFlags", + "SupportedPlatforms": "linux-x64,linux-arm64" + } + }, + { + "Type": "SpecCpuExecutor", + "Parameters": { + "Scenario": "benchmark_641.leela_s", + "Iterations": "$.Parameters.Iterations", + "SpecProfile": "intspeed", + "Benchmarks": "641", "PackageName": "speccpu2017", "RunPeak": "$.Parameters.RunPeak", "Threads": "$.Parameters.Threads", @@ -38,6 +149,38 @@ "BaseOptimizingFlags": "$.Parameters.BaseOptimizingFlags", "PeakOptimizingFlags": "$.Parameters.PeakOptimizingFlags" } + }, + { + "Type": "SpecCpuExecutor", + "Parameters": { + "Scenario": "benchmark_648.exchange2_s", + "Iterations": "$.Parameters.Iterations", + "SpecProfile": "intspeed", + "Benchmarks": "648", + "PackageName": "speccpu2017", + "RunPeak": "$.Parameters.RunPeak", + "Threads": "$.Parameters.Threads", + "Copies": "$.Parameters.Copies", + "BaseOptimizingFlags": "$.Parameters.BaseOptimizingFlags", + "PeakOptimizingFlags": "$.Parameters.PeakOptimizingFlags", + "SupportedPlatforms": "linux-x64,linux-arm64" + } + }, + { + "Type": "SpecCpuExecutor", + "Parameters": { + "Scenario": "benchmark_657.xz_s", + "Iterations": "$.Parameters.Iterations", + "SpecProfile": "intspeed", + "Benchmarks": "657", + "PackageName": "speccpu2017", + "RunPeak": "$.Parameters.RunPeak", + "Threads": "$.Parameters.Threads", + "Copies": "$.Parameters.Copies", + "BaseOptimizingFlags": "$.Parameters.BaseOptimizingFlags", + "PeakOptimizingFlags": "$.Parameters.PeakOptimizingFlags", + "SupportedPlatforms": "linux-x64,linux-arm64" + } } ], "Dependencies": [ @@ -46,7 +189,7 @@ "Parameters": { "Scenario": "MaskAptDailyTimers", "SupportedPlatforms": "linux-x64,linux-arm64", - "Command": "bash -c 'systemctl mask apt-daily.timer apt-daily-upgrade.timer apt-daily.service apt-daily-upgrade.service; systemctl stop apt-daily.timer apt-daily-upgrade.timer apt-daily.service apt-daily-upgrade.service; exit 0'" + "Command": "bash -c \"systemctl mask apt-daily.timer apt-daily-upgrade.timer apt-daily.service apt-daily-upgrade.service; systemctl stop apt-daily.timer apt-daily-upgrade.timer apt-daily.service apt-daily-upgrade.service; exit 0\"" } }, { diff --git a/website/docs/workloads/speccpu/speccpu-profiles.md b/website/docs/workloads/speccpu/speccpu-profiles.md index f0808ef136..2b70aa5624 100644 --- a/website/docs/workloads/speccpu/speccpu-profiles.md +++ b/website/docs/workloads/speccpu/speccpu-profiles.md @@ -18,7 +18,6 @@ for evaluating the performance of the CPU for processing calculations. * linux-x64 * linux-arm64 * win-x64 - * win-arm64 **Note**: On Windows platform, the **gcc** compiler version is required to be 10 or higher. @@ -76,7 +75,6 @@ for evaluating the performance of the CPU for processing calculations. * linux-x64 * linux-arm64 * win-x64 - * win-arm64 **Note**: Not supported currently on Ubuntu 24. @@ -130,7 +128,6 @@ for evaluating the performance of the CPU for processing calculations. * linux-x64 * linux-arm64 * win-x64 - * win-arm64 * **Supports Disconnected Scenarios** * No. Internet connection required. @@ -181,7 +178,6 @@ for evaluating the performance of the CPU for processing calculations. * linux-x64 * linux-arm64 * win-x64 - * win-arm64 * **Supports Disconnected Scenarios** * No. Internet connection required.