From 472c10b9792bbb6b1713b7fe97236d1178c52fad Mon Sep 17 00:00:00 2001 From: Thomas Roeblitz Date: Tue, 23 Jan 2024 21:18:13 +0100 Subject: [PATCH] cleanup archdetect: specs for archs provided by NESSI and CI tests --- .github/workflows/tests_archdetect.yml | 9 +++--- init/arch_specs/eessi_arch_x86.spec | 6 ++-- .../AWS-awslinux-graviton2.all.output | 1 - .../AWS-awslinux-graviton2.cpuinfo | 8 ----- .../neoverse_n1/AWS-awslinux-graviton2.output | 1 - .../Azure-Ubuntu20-Altra.all.output | 1 - .../neoverse_n1/Azure-Ubuntu20-Altra.cpuinfo | 30 ------------------- .../neoverse_n1/Azure-Ubuntu20-Altra.output | 1 - .../AWS-awslinux-graviton3.all.output | 1 - .../AWS-awslinux-graviton3.cpuinfo | 8 ----- .../neoverse_v1/AWS-awslinux-graviton3.output | 1 - .../power9le/unknown-power9le.all.output | 1 - .../ppc64le/power9le/unknown-power9le.cpuinfo | 4 --- .../ppc64le/power9le/unknown-power9le.output | 1 - .../amd/zen3/Azure-CentOS7-7V73X.all.output | 1 - .../amd/zen3/Azure-CentOS7-7V73X.cpuinfo | 27 ----------------- .../amd/zen3/Azure-CentOS7-7V73X.output | 1 - .../archspec-linux-E5-2680-v3.all.output | 0 .../archspec-linux-E5-2680-v3.cpuinfo | 0 .../archspec-linux-E5-2680-v3.output | 0 .../archspec-linux-E5-2683-v4.all.output | 1 + .../archspec-linux-E5-2683-v4.cpuinfo | 27 +++++++++++++++++ .../archspec-linux-E5-2683-v4.output | 1 + 23 files changed, 38 insertions(+), 93 deletions(-) delete mode 100644 tests/archdetect/aarch64/neoverse_n1/AWS-awslinux-graviton2.all.output delete mode 100644 tests/archdetect/aarch64/neoverse_n1/AWS-awslinux-graviton2.cpuinfo delete mode 100644 tests/archdetect/aarch64/neoverse_n1/AWS-awslinux-graviton2.output delete mode 100644 tests/archdetect/aarch64/neoverse_n1/Azure-Ubuntu20-Altra.all.output delete mode 100644 tests/archdetect/aarch64/neoverse_n1/Azure-Ubuntu20-Altra.cpuinfo delete mode 100644 tests/archdetect/aarch64/neoverse_n1/Azure-Ubuntu20-Altra.output delete mode 100644 tests/archdetect/aarch64/neoverse_v1/AWS-awslinux-graviton3.all.output delete mode 100644 tests/archdetect/aarch64/neoverse_v1/AWS-awslinux-graviton3.cpuinfo delete mode 100644 tests/archdetect/aarch64/neoverse_v1/AWS-awslinux-graviton3.output delete mode 100644 tests/archdetect/ppc64le/power9le/unknown-power9le.all.output delete mode 100644 tests/archdetect/ppc64le/power9le/unknown-power9le.cpuinfo delete mode 100644 tests/archdetect/ppc64le/power9le/unknown-power9le.output delete mode 100644 tests/archdetect/x86_64/amd/zen3/Azure-CentOS7-7V73X.all.output delete mode 100644 tests/archdetect/x86_64/amd/zen3/Azure-CentOS7-7V73X.cpuinfo delete mode 100644 tests/archdetect/x86_64/amd/zen3/Azure-CentOS7-7V73X.output rename tests/archdetect/x86_64/intel/{haswell => broadwell}/archspec-linux-E5-2680-v3.all.output (100%) rename tests/archdetect/x86_64/intel/{haswell => broadwell}/archspec-linux-E5-2680-v3.cpuinfo (100%) rename tests/archdetect/x86_64/intel/{haswell => broadwell}/archspec-linux-E5-2680-v3.output (100%) create mode 100644 tests/archdetect/x86_64/intel/broadwell/archspec-linux-E5-2683-v4.all.output create mode 100644 tests/archdetect/x86_64/intel/broadwell/archspec-linux-E5-2683-v4.cpuinfo create mode 100644 tests/archdetect/x86_64/intel/broadwell/archspec-linux-E5-2683-v4.output diff --git a/.github/workflows/tests_archdetect.yml b/.github/workflows/tests_archdetect.yml index 74dbf032f0..380b625303 100644 --- a/.github/workflows/tests_archdetect.yml +++ b/.github/workflows/tests_archdetect.yml @@ -9,16 +9,17 @@ jobs: strategy: matrix: proc_cpuinfo: - - x86_64/intel/haswell/archspec-linux-E5-2680-v3 + - x86_64/intel/broadwell/archspec-linux-E5-2683-v4 - x86_64/intel/skylake_avx512/archspec-linux-6132 - x86_64/amd/zen2/Azure-CentOS7-7V12 - - x86_64/amd/zen3/Azure-CentOS7-7V73X # commented out since these targets are currently not supported in pilot.nessi.no repo # (and some tests assume that the corresponding subdirectory in software layer is there) - # - ppc64le/power9le/unknown-power9le # - aarch64/neoverse-n1/Azure-Ubuntu20-Altra # - aarch64/neoverse-n1/AWS-awslinux-graviton2 # - aarch64/neoverse-v1/AWS-awslinux-graviton3 + # - ppc64le/power9le/unknown-power9le + # - x86_64/intel/haswell/archspec-linux-E5-2680-v3 + # - x86_64/amd/zen3/Azure-CentOS7-7V73X fail-fast: false steps: - name: checkout @@ -62,7 +63,7 @@ jobs: echo "Test for ${{matrix.proc_cpuinfo}} FAILED: $CPU_ARCHES" >&2 exit 1 fi - # Check all those architectures actually exist (if this EESSI version has been populated already) + # Check all those architectures actually exist (if this NESSI version has been populated already) if [ -d ${EESSI_PREFIX}/software/linux ]; then for dir in $(echo "$CPU_ARCHES" | tr ':' '\n'); do # Search all EESSI versions as we may drop support at some point diff --git a/init/arch_specs/eessi_arch_x86.spec b/init/arch_specs/eessi_arch_x86.spec index df85154b27..19002a576f 100755 --- a/init/arch_specs/eessi_arch_x86.spec +++ b/init/arch_specs/eessi_arch_x86.spec @@ -1,7 +1,9 @@ # x86_64 CPU architecture specifications # Software path in EESSI | Vendor ID | List of defining CPU features -"x86_64/intel/haswell" "GenuineIntel" "avx2 fma" # Intel Haswell +# 2024-01-23: comment out haswell as it is not supported by NESSI and causes CI +# to fail +# "x86_64/intel/haswell" "GenuineIntel" "avx2 fma" # Intel Haswell "x86_64/intel/broadwell" "GenuineIntel" "avx2 fma rdseed adx" # Intel Broadwell "x86_64/intel/skylake_avx512" "GenuineIntel" "avx2 fma avx512f avx512bw avx512cd avx512dq avx512vl" # Intel Skylake, Cascade Lake "x86_64/amd/zen2" "AuthenticAMD" "avx2 fma" # AMD Rome -"x86_64/amd/zen3" "AuthenticAMD" "avx2 fma vaes" # AMD Milan, Milan-X +# "x86_64/amd/zen3" "AuthenticAMD" "avx2 fma vaes" # AMD Milan, Milan-X diff --git a/tests/archdetect/aarch64/neoverse_n1/AWS-awslinux-graviton2.all.output b/tests/archdetect/aarch64/neoverse_n1/AWS-awslinux-graviton2.all.output deleted file mode 100644 index 340aaa5d02..0000000000 --- a/tests/archdetect/aarch64/neoverse_n1/AWS-awslinux-graviton2.all.output +++ /dev/null @@ -1 +0,0 @@ -aarch64/neoverse_n1:aarch64/generic diff --git a/tests/archdetect/aarch64/neoverse_n1/AWS-awslinux-graviton2.cpuinfo b/tests/archdetect/aarch64/neoverse_n1/AWS-awslinux-graviton2.cpuinfo deleted file mode 100644 index 17f1615825..0000000000 --- a/tests/archdetect/aarch64/neoverse_n1/AWS-awslinux-graviton2.cpuinfo +++ /dev/null @@ -1,8 +0,0 @@ -processor : 0 -BogoMIPS : 243.75 -Features : fp asimd evtstrm aes pmull sha1 sha2 crc32 atomics fphp asimdhp cpuid asimdrdm lrcpc dcpop asimddp ssbs -CPU implementer : 0x41 -CPU architecture: 8 -CPU variant : 0x3 -CPU part : 0xd0c -CPU revision : 1 diff --git a/tests/archdetect/aarch64/neoverse_n1/AWS-awslinux-graviton2.output b/tests/archdetect/aarch64/neoverse_n1/AWS-awslinux-graviton2.output deleted file mode 100644 index a9bd49c75c..0000000000 --- a/tests/archdetect/aarch64/neoverse_n1/AWS-awslinux-graviton2.output +++ /dev/null @@ -1 +0,0 @@ -aarch64/neoverse_n1 diff --git a/tests/archdetect/aarch64/neoverse_n1/Azure-Ubuntu20-Altra.all.output b/tests/archdetect/aarch64/neoverse_n1/Azure-Ubuntu20-Altra.all.output deleted file mode 100644 index 340aaa5d02..0000000000 --- a/tests/archdetect/aarch64/neoverse_n1/Azure-Ubuntu20-Altra.all.output +++ /dev/null @@ -1 +0,0 @@ -aarch64/neoverse_n1:aarch64/generic diff --git a/tests/archdetect/aarch64/neoverse_n1/Azure-Ubuntu20-Altra.cpuinfo b/tests/archdetect/aarch64/neoverse_n1/Azure-Ubuntu20-Altra.cpuinfo deleted file mode 100644 index 49824722f2..0000000000 --- a/tests/archdetect/aarch64/neoverse_n1/Azure-Ubuntu20-Altra.cpuinfo +++ /dev/null @@ -1,30 +0,0 @@ -Architecture: aarch64 -CPU op-mode(s): 32-bit, 64-bit -Byte Order: Little Endian -CPU(s): 64 -On-line CPU(s) list: 0-63 -Thread(s) per core: 1 -Core(s) per socket: 64 -Socket(s): 1 -NUMA node(s): 1 -Vendor ID: ARM -Model: 1 -Model name: Neoverse-N1 -Stepping: r3p1 -BogoMIPS: 50.00 -L1d cache: 4 MiB -L1i cache: 4 MiB -L2 cache: 64 MiB -L3 cache: 32 MiB -NUMA node0 CPU(s): 0-63 -Vulnerability Itlb multihit: Not affected -Vulnerability L1tf: Not affected -Vulnerability Mds: Not affected -Vulnerability Meltdown: Mitigation; PTI -Vulnerability Mmio stale data: Not affected -Vulnerability Spec store bypass: Not affected -Vulnerability Spectre v1: Mitigation; __user pointer sanitization -Vulnerability Spectre v2: Mitigation; CSV2, BHB -Vulnerability Srbds: Not affected -Vulnerability Tsx async abort: Not affected -Flags: fp asimd evtstrm aes pmull sha1 sha2 crc32 atomics fphp asimdhp cpuid asimdrdm lrcpc dcpop asimddp diff --git a/tests/archdetect/aarch64/neoverse_n1/Azure-Ubuntu20-Altra.output b/tests/archdetect/aarch64/neoverse_n1/Azure-Ubuntu20-Altra.output deleted file mode 100644 index a9bd49c75c..0000000000 --- a/tests/archdetect/aarch64/neoverse_n1/Azure-Ubuntu20-Altra.output +++ /dev/null @@ -1 +0,0 @@ -aarch64/neoverse_n1 diff --git a/tests/archdetect/aarch64/neoverse_v1/AWS-awslinux-graviton3.all.output b/tests/archdetect/aarch64/neoverse_v1/AWS-awslinux-graviton3.all.output deleted file mode 100644 index 920d5f9996..0000000000 --- a/tests/archdetect/aarch64/neoverse_v1/AWS-awslinux-graviton3.all.output +++ /dev/null @@ -1 +0,0 @@ -aarch64/neoverse_v1:aarch64/neoverse_n1:aarch64/generic diff --git a/tests/archdetect/aarch64/neoverse_v1/AWS-awslinux-graviton3.cpuinfo b/tests/archdetect/aarch64/neoverse_v1/AWS-awslinux-graviton3.cpuinfo deleted file mode 100644 index 01246f99da..0000000000 --- a/tests/archdetect/aarch64/neoverse_v1/AWS-awslinux-graviton3.cpuinfo +++ /dev/null @@ -1,8 +0,0 @@ -processor : 0 -BogoMIPS : 2100.00 -Features : fp asimd evtstrm aes pmull sha1 sha2 crc32 atomics fphp asimdhp cpuid asimdrdm jscvt fcma lrcpc dcpop sha3 sm3 sm4 asimddp sha512 sve asimdfhm dit uscat ilrcpc flagm ssbs paca pacg dcpodp svei8mm svebf16 i8mm bf16 dgh rng -CPU implementer : 0x41 -CPU architecture: 8 -CPU variant : 0x1 -CPU part : 0xd40 -CPU revision : 1 diff --git a/tests/archdetect/aarch64/neoverse_v1/AWS-awslinux-graviton3.output b/tests/archdetect/aarch64/neoverse_v1/AWS-awslinux-graviton3.output deleted file mode 100644 index a8e072a9c6..0000000000 --- a/tests/archdetect/aarch64/neoverse_v1/AWS-awslinux-graviton3.output +++ /dev/null @@ -1 +0,0 @@ -aarch64/neoverse_v1 diff --git a/tests/archdetect/ppc64le/power9le/unknown-power9le.all.output b/tests/archdetect/ppc64le/power9le/unknown-power9le.all.output deleted file mode 100644 index 7ecf79d0a7..0000000000 --- a/tests/archdetect/ppc64le/power9le/unknown-power9le.all.output +++ /dev/null @@ -1 +0,0 @@ -ppc64le/power9le:ppc64le/generic \ No newline at end of file diff --git a/tests/archdetect/ppc64le/power9le/unknown-power9le.cpuinfo b/tests/archdetect/ppc64le/power9le/unknown-power9le.cpuinfo deleted file mode 100644 index 4e6bdbb97b..0000000000 --- a/tests/archdetect/ppc64le/power9le/unknown-power9le.cpuinfo +++ /dev/null @@ -1,4 +0,0 @@ -processor : 0 -cpu : POWER9 (architected), altivec supported -clock : 2200.000000MHz -revision : 2.2 (pvr 004e 1202) diff --git a/tests/archdetect/ppc64le/power9le/unknown-power9le.output b/tests/archdetect/ppc64le/power9le/unknown-power9le.output deleted file mode 100644 index 8decf544ea..0000000000 --- a/tests/archdetect/ppc64le/power9le/unknown-power9le.output +++ /dev/null @@ -1 +0,0 @@ -ppc64le/power9le diff --git a/tests/archdetect/x86_64/amd/zen3/Azure-CentOS7-7V73X.all.output b/tests/archdetect/x86_64/amd/zen3/Azure-CentOS7-7V73X.all.output deleted file mode 100644 index 798a0aa565..0000000000 --- a/tests/archdetect/x86_64/amd/zen3/Azure-CentOS7-7V73X.all.output +++ /dev/null @@ -1 +0,0 @@ -x86_64/amd/zen3:x86_64/amd/zen2:x86_64/generic \ No newline at end of file diff --git a/tests/archdetect/x86_64/amd/zen3/Azure-CentOS7-7V73X.cpuinfo b/tests/archdetect/x86_64/amd/zen3/Azure-CentOS7-7V73X.cpuinfo deleted file mode 100644 index 24961c80c3..0000000000 --- a/tests/archdetect/x86_64/amd/zen3/Azure-CentOS7-7V73X.cpuinfo +++ /dev/null @@ -1,27 +0,0 @@ -Architecture: x86_64 -CPU op-mode(s): 32-bit, 64-bit -Byte Order: Little Endian -CPU(s): 120 -On-line CPU(s) list: 0-119 -Thread(s) per core: 1 -Core(s) per socket: 60 -Socket(s): 2 -NUMA node(s): 4 -Vendor ID: AuthenticAMD -CPU family: 25 -Model: 1 -Model name: AMD EPYC 7V73X 64-Core Processor -Stepping: 2 -CPU MHz: 1846.550 -BogoMIPS: 3693.10 -Hypervisor vendor: Microsoft -Virtualization type: full -L1d cache: 32K -L1i cache: 32K -L2 cache: 512K -L3 cache: 98304K -NUMA node0 CPU(s): 0-29 -NUMA node1 CPU(s): 30-59 -NUMA node2 CPU(s): 60-89 -NUMA node3 CPU(s): 90-119 -Flags: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm art rep_good nopl extd_apicid aperfmperf eagerfpu pni pclmulqdq ssse3 fma cx16 pcid sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand hypervisor lahf_lm cmp_legacy cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw topoext perfctr_core invpcid_single retpoline_amd vmmcall fsgsbase bmi1 avx2 smep bmi2 invpcid rdseed adx smap clflushopt clwb sha_ni xsaveopt xsavec xgetbv1 clzero xsaveerptr arat umip vaes vpclmulqdq diff --git a/tests/archdetect/x86_64/amd/zen3/Azure-CentOS7-7V73X.output b/tests/archdetect/x86_64/amd/zen3/Azure-CentOS7-7V73X.output deleted file mode 100644 index 341c027cc2..0000000000 --- a/tests/archdetect/x86_64/amd/zen3/Azure-CentOS7-7V73X.output +++ /dev/null @@ -1 +0,0 @@ -x86_64/amd/zen3 diff --git a/tests/archdetect/x86_64/intel/haswell/archspec-linux-E5-2680-v3.all.output b/tests/archdetect/x86_64/intel/broadwell/archspec-linux-E5-2680-v3.all.output similarity index 100% rename from tests/archdetect/x86_64/intel/haswell/archspec-linux-E5-2680-v3.all.output rename to tests/archdetect/x86_64/intel/broadwell/archspec-linux-E5-2680-v3.all.output diff --git a/tests/archdetect/x86_64/intel/haswell/archspec-linux-E5-2680-v3.cpuinfo b/tests/archdetect/x86_64/intel/broadwell/archspec-linux-E5-2680-v3.cpuinfo similarity index 100% rename from tests/archdetect/x86_64/intel/haswell/archspec-linux-E5-2680-v3.cpuinfo rename to tests/archdetect/x86_64/intel/broadwell/archspec-linux-E5-2680-v3.cpuinfo diff --git a/tests/archdetect/x86_64/intel/haswell/archspec-linux-E5-2680-v3.output b/tests/archdetect/x86_64/intel/broadwell/archspec-linux-E5-2680-v3.output similarity index 100% rename from tests/archdetect/x86_64/intel/haswell/archspec-linux-E5-2680-v3.output rename to tests/archdetect/x86_64/intel/broadwell/archspec-linux-E5-2680-v3.output diff --git a/tests/archdetect/x86_64/intel/broadwell/archspec-linux-E5-2683-v4.all.output b/tests/archdetect/x86_64/intel/broadwell/archspec-linux-E5-2683-v4.all.output new file mode 100644 index 0000000000..99a7128096 --- /dev/null +++ b/tests/archdetect/x86_64/intel/broadwell/archspec-linux-E5-2683-v4.all.output @@ -0,0 +1 @@ +x86_64/intel/broadwell:x86_64/generic diff --git a/tests/archdetect/x86_64/intel/broadwell/archspec-linux-E5-2683-v4.cpuinfo b/tests/archdetect/x86_64/intel/broadwell/archspec-linux-E5-2683-v4.cpuinfo new file mode 100644 index 0000000000..f7ab557924 --- /dev/null +++ b/tests/archdetect/x86_64/intel/broadwell/archspec-linux-E5-2683-v4.cpuinfo @@ -0,0 +1,27 @@ +processor : 0 +vendor_id : GenuineIntel +cpu family : 6 +model : 79 +model name : Intel(R) Xeon(R) CPU E5-2683 v4 @ 2.10GHz +stepping : 1 +microcode : 0xb000014 +cpu MHz : 3000.000 +cache size : 40960 KB +physical id : 0 +siblings : 32 +core id : 0 +cpu cores : 16 +apicid : 0 +initial apicid : 0 +fpu : yes +fpu_exception : yes +cpuid level : 20 +wp : yes +flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb cat_l3 cdp_l3 invpcid_single pti intel_ppin tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm cqm rdt_a rdseed adx smap intel_pt xsaveopt cqm_llc cqm_occup_llc cqm_mbm_total cqm_mbm_local dtherm ida arat pln pts +vmx flags : vnmi preemption_timer posted_intr invvpid ept_x_only ept_ad ept_1gb flexpriority apicv tsc_offset vtpr mtf vapic ept vpid unrestricted_guest vapic_reg vid ple shadow_vmcs pml +bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs taa itlb_multihit mmio_stale_data +bogomips : 4199.76 +clflush size : 64 +cache_alignment : 64 +address sizes : 46 bits physical, 48 bits virtual +power management: diff --git a/tests/archdetect/x86_64/intel/broadwell/archspec-linux-E5-2683-v4.output b/tests/archdetect/x86_64/intel/broadwell/archspec-linux-E5-2683-v4.output new file mode 100644 index 0000000000..21aa833a6d --- /dev/null +++ b/tests/archdetect/x86_64/intel/broadwell/archspec-linux-E5-2683-v4.output @@ -0,0 +1 @@ +x86_64/intel/broadwell