diff --git a/tests/intel/README.md b/tests/intel/README.md
new file mode 100644
index 0000000..6f251e2
--- /dev/null
+++ b/tests/intel/README.md
@@ -0,0 +1,4 @@
+# Intel tests
+
+Directories based on [List of Intel CPU microarchitectures](https://en.wikipedia.org/wiki/List_of_Intel_CPU_microarchitectures).  
+Each sub-directory is named after the micro-architecture.
diff --git a/tests/intel/netburst/celeron-northwood.test.test b/tests/intel/ia-32/netburst/northwood-celeron.test
similarity index 100%
rename from tests/intel/netburst/celeron-northwood.test.test
rename to tests/intel/ia-32/netburst/northwood-celeron.test
diff --git a/tests/intel/netburst/mobile-p4-northwood.test b/tests/intel/ia-32/netburst/northwood-pentium-m.test
similarity index 100%
rename from tests/intel/netburst/mobile-p4-northwood.test
rename to tests/intel/ia-32/netburst/northwood-pentium-m.test
diff --git a/tests/intel/netburst/p4-northwood.test b/tests/intel/ia-32/netburst/northwood-pentium.test
similarity index 100%
rename from tests/intel/netburst/p4-northwood.test
rename to tests/intel/ia-32/netburst/northwood-pentium.test
diff --git a/tests/intel/netburst/celeron-prescott.test b/tests/intel/ia-32/netburst/prescott-celeron.test
similarity index 100%
rename from tests/intel/netburst/celeron-prescott.test
rename to tests/intel/ia-32/netburst/prescott-celeron.test
diff --git a/tests/intel/netburst/p4-prescott-ht.test b/tests/intel/ia-32/netburst/prescott-pentium.test
similarity index 100%
rename from tests/intel/netburst/p4-prescott-ht.test
rename to tests/intel/ia-32/netburst/prescott-pentium.test
diff --git a/tests/intel/netburst/xeon-prestonia.test b/tests/intel/ia-32/netburst/prestonia-xeon.test
similarity index 100%
rename from tests/intel/netburst/xeon-prestonia.test
rename to tests/intel/ia-32/netburst/prestonia-xeon.test
diff --git a/tests/intel/netburst/celeron-willamette.test b/tests/intel/ia-32/netburst/willamette-celeron.test
similarity index 100%
rename from tests/intel/netburst/celeron-willamette.test
rename to tests/intel/ia-32/netburst/willamette-celeron.test
diff --git a/tests/intel/p2/celeron-coppermine.test b/tests/intel/ia-32/p6/coppermine-celeron.test
similarity index 100%
rename from tests/intel/p2/celeron-coppermine.test
rename to tests/intel/ia-32/p6/coppermine-celeron.test
diff --git a/tests/intel/p2/pentium-coppermine.test b/tests/intel/ia-32/p6/coppermine-pentium.test
similarity index 100%
rename from tests/intel/p2/pentium-coppermine.test
rename to tests/intel/ia-32/p6/coppermine-pentium.test
diff --git a/tests/intel/p2/pentium-dixon.test b/tests/intel/ia-32/p6/dixon-pentium.test
similarity index 100%
rename from tests/intel/p2/pentium-dixon.test
rename to tests/intel/ia-32/p6/dixon-pentium.test
diff --git a/tests/intel/p2/petium-m-dothan.test b/tests/intel/ia-32/p6/dothan-pentium-m.test
similarity index 100%
rename from tests/intel/p2/petium-m-dothan.test
rename to tests/intel/ia-32/p6/dothan-pentium-m.test
diff --git a/tests/intel/core2/yonah.test b/tests/intel/ia-32/p6/yonah-core-duo-t2400.test
similarity index 100%
rename from tests/intel/core2/yonah.test
rename to tests/intel/ia-32/p6/yonah-core-duo-t2400.test
diff --git a/tests/intel/core2/yonah-3.test b/tests/intel/ia-32/p6/yonah-core-duo-t2600.test
similarity index 100%
rename from tests/intel/core2/yonah-3.test
rename to tests/intel/ia-32/p6/yonah-core-duo-t2600.test
diff --git a/tests/intel/core2/yonah-2.test b/tests/intel/ia-32/p6/yonah-core-solo.test
similarity index 100%
rename from tests/intel/core2/yonah-2.test
rename to tests/intel/ia-32/p6/yonah-core-solo.test
diff --git a/tests/intel/qemu/qemu.test b/tests/intel/qemu/qemu-cpu64-rhel6.test
similarity index 100%
rename from tests/intel/qemu/qemu.test
rename to tests/intel/qemu/qemu-cpu64-rhel6.test
diff --git a/tests/intel/core2/allendale.test b/tests/intel/x86-64/core/allendale-core-2-duo.test
similarity index 100%
rename from tests/intel/core2/allendale.test
rename to tests/intel/x86-64/core/allendale-core-2-duo.test
diff --git a/tests/intel/core2/xeon-clovertown.test b/tests/intel/x86-64/core/clovertown-xeon.test
similarity index 100%
rename from tests/intel/core2/xeon-clovertown.test
rename to tests/intel/x86-64/core/clovertown-xeon.test
diff --git a/tests/intel/core2/conroe-1m.test b/tests/intel/x86-64/core/conroe-1m.test
similarity index 100%
rename from tests/intel/core2/conroe-1m.test
rename to tests/intel/x86-64/core/conroe-1m.test
diff --git a/tests/intel/core2/conroe.test b/tests/intel/x86-64/core/conroe-core-2-duo.test
similarity index 100%
rename from tests/intel/core2/conroe.test
rename to tests/intel/x86-64/core/conroe-core-2-duo.test
diff --git a/tests/intel/core2/conroe-l.test b/tests/intel/x86-64/core/conroe-l-celeron-e.test
similarity index 100%
rename from tests/intel/core2/conroe-l.test
rename to tests/intel/x86-64/core/conroe-l-celeron-e.test
diff --git a/tests/intel/core2/conroe-l-celeron.test b/tests/intel/x86-64/core/conroe-l-celeron.test
similarity index 100%
rename from tests/intel/core2/conroe-l-celeron.test
rename to tests/intel/x86-64/core/conroe-l-celeron.test
diff --git a/tests/intel/core2/xeon-harpertown.test b/tests/intel/x86-64/core/harpertown-xeon.test
similarity index 100%
rename from tests/intel/core2/xeon-harpertown.test
rename to tests/intel/x86-64/core/harpertown-xeon.test
diff --git a/tests/intel/core2/kentsfield.test b/tests/intel/x86-64/core/kentsfield-core-2-quad.test
similarity index 100%
rename from tests/intel/core2/kentsfield.test
rename to tests/intel/x86-64/core/kentsfield-core-2-quad.test
diff --git a/tests/intel/core2/merom-2m.test b/tests/intel/x86-64/core/merom-core-2-duo-2m.test
similarity index 100%
rename from tests/intel/core2/merom-2m.test
rename to tests/intel/x86-64/core/merom-core-2-duo-2m.test
diff --git a/tests/intel/core2/merom.test b/tests/intel/x86-64/core/merom-core-2-duo-4m.test
similarity index 100%
rename from tests/intel/core2/merom.test
rename to tests/intel/x86-64/core/merom-core-2-duo-4m.test
diff --git a/tests/intel/core2/penryn-3m.test b/tests/intel/x86-64/core/penryn-core-2-duo-3m.test
similarity index 100%
rename from tests/intel/core2/penryn-3m.test
rename to tests/intel/x86-64/core/penryn-core-2-duo-3m.test
diff --git a/tests/intel/core2/celeron-penryn-l.test b/tests/intel/x86-64/core/penryn-l-celeron.test
similarity index 100%
rename from tests/intel/core2/celeron-penryn-l.test
rename to tests/intel/x86-64/core/penryn-l-celeron.test
diff --git a/tests/intel/core2/penryn-mobile.test b/tests/intel/x86-64/core/penryn-pentium-m.test
similarity index 100%
rename from tests/intel/core2/penryn-mobile.test
rename to tests/intel/x86-64/core/penryn-pentium-m.test
diff --git a/tests/intel/core2/celeron-wolfdale.test b/tests/intel/x86-64/core/wolfdale-celeron.test
similarity index 100%
rename from tests/intel/core2/celeron-wolfdale.test
rename to tests/intel/x86-64/core/wolfdale-celeron.test
diff --git a/tests/intel/core2/wolfdale.test b/tests/intel/x86-64/core/wolfdale-pentium.test
similarity index 100%
rename from tests/intel/core2/wolfdale.test
rename to tests/intel/x86-64/core/wolfdale-pentium.test
diff --git a/tests/intel/core2/xeon-wolfdale.test b/tests/intel/x86-64/core/wolfdale-xeon.test
similarity index 100%
rename from tests/intel/core2/xeon-wolfdale.test
rename to tests/intel/x86-64/core/wolfdale-xeon.test
diff --git a/tests/intel/core2/yorkfield-2m.test b/tests/intel/x86-64/core/yorkfield-core-2-quad-2m.test
similarity index 100%
rename from tests/intel/core2/yorkfield-2m.test
rename to tests/intel/x86-64/core/yorkfield-core-2-quad-2m.test
diff --git a/tests/intel/core2/yorkfield.test b/tests/intel/x86-64/core/yorkfield-core-2-quad-6m.test
similarity index 100%
rename from tests/intel/core2/yorkfield.test
rename to tests/intel/x86-64/core/yorkfield-core-2-quad-6m.test
diff --git a/tests/intel/core_11th_gen/rocket-lake-i7.test b/tests/intel/x86-64/cypress-cove/rocket-lake-core-i7.test
similarity index 100%
rename from tests/intel/core_11th_gen/rocket-lake-i7.test
rename to tests/intel/x86-64/cypress-cove/rocket-lake-core-i7.test
diff --git a/tests/intel/core_11th_gen/rocket-lake-xeon-e.test b/tests/intel/x86-64/cypress-cove/rocket-lake-xeon-e.test
similarity index 100%
rename from tests/intel/core_11th_gen/rocket-lake-xeon-e.test
rename to tests/intel/x86-64/cypress-cove/rocket-lake-xeon-e.test
diff --git a/tests/intel/core_12th_gen/alder-lake-h-i7.test b/tests/intel/x86-64/golden-cove/alder-lake-h-core-i7.test
similarity index 100%
rename from tests/intel/core_12th_gen/alder-lake-h-i7.test
rename to tests/intel/x86-64/golden-cove/alder-lake-h-core-i7.test
diff --git a/tests/intel/core_12th_gen/alder-lake-h-i9.test b/tests/intel/x86-64/golden-cove/alder-lake-h-core-i9.test
similarity index 100%
rename from tests/intel/core_12th_gen/alder-lake-h-i9.test
rename to tests/intel/x86-64/golden-cove/alder-lake-h-core-i9.test
diff --git a/tests/intel/core_12th_gen/alder-lake-hx-i7.test b/tests/intel/x86-64/golden-cove/alder-lake-hx-core-i7.test
similarity index 100%
rename from tests/intel/core_12th_gen/alder-lake-hx-i7.test
rename to tests/intel/x86-64/golden-cove/alder-lake-hx-core-i7.test
diff --git a/tests/intel/core_12th_gen/alder-lake-n95.test b/tests/intel/x86-64/golden-cove/alder-lake-n95.test
similarity index 100%
rename from tests/intel/core_12th_gen/alder-lake-n95.test
rename to tests/intel/x86-64/golden-cove/alder-lake-n95.test
diff --git a/tests/intel/core_12th_gen/alder-lake-p-i3.test b/tests/intel/x86-64/golden-cove/alder-lake-p-core-i3.test
similarity index 100%
rename from tests/intel/core_12th_gen/alder-lake-p-i3.test
rename to tests/intel/x86-64/golden-cove/alder-lake-p-core-i3.test
diff --git a/tests/intel/core_12th_gen/alder-lake-s-i5.test b/tests/intel/x86-64/golden-cove/alder-lake-s-core-i5.test
similarity index 100%
rename from tests/intel/core_12th_gen/alder-lake-s-i5.test
rename to tests/intel/x86-64/golden-cove/alder-lake-s-core-i5.test
diff --git a/tests/intel/core_12th_gen/alder-lake-s-i9.test b/tests/intel/x86-64/golden-cove/alder-lake-s-core-i9.test
similarity index 100%
rename from tests/intel/core_12th_gen/alder-lake-s-i9.test
rename to tests/intel/x86-64/golden-cove/alder-lake-s-core-i9.test
diff --git a/tests/intel/core_12th_gen/alder-lake-s-pentium.test b/tests/intel/x86-64/golden-cove/alder-lake-s-pentium.test
similarity index 100%
rename from tests/intel/core_12th_gen/alder-lake-s-pentium.test
rename to tests/intel/x86-64/golden-cove/alder-lake-s-pentium.test
diff --git a/tests/intel/core_13th_gen/raptor-lake-s-i5-golden-cove.test b/tests/intel/x86-64/golden-cove/raptor-lake-s-core-i5.test
similarity index 100%
rename from tests/intel/core_13th_gen/raptor-lake-s-i5-golden-cove.test
rename to tests/intel/x86-64/golden-cove/raptor-lake-s-core-i5.test
diff --git a/tests/intel/golden-cove/sapphire-rapids-ws-xeon-w7.test b/tests/intel/x86-64/golden-cove/sapphire-rapids-ws-xeon-w7.test
similarity index 100%
rename from tests/intel/golden-cove/sapphire-rapids-ws-xeon-w7.test
rename to tests/intel/x86-64/golden-cove/sapphire-rapids-ws-xeon-w7.test
diff --git a/tests/intel/core_5th_gen/broadwell-e-i7.test b/tests/intel/x86-64/haswell/broadwell-e-core-i7.test
similarity index 100%
rename from tests/intel/core_5th_gen/broadwell-e-i7.test
rename to tests/intel/x86-64/haswell/broadwell-e-core-i7.test
diff --git a/tests/intel/core_4th_gen/crystalwell-i7.test b/tests/intel/x86-64/haswell/crystal-well-core-i7.test
similarity index 100%
rename from tests/intel/core_4th_gen/crystalwell-i7.test
rename to tests/intel/x86-64/haswell/crystal-well-core-i7.test
diff --git a/tests/intel/core_4th_gen/haswell-i3.test b/tests/intel/x86-64/haswell/haswell-core-i3.test
similarity index 100%
rename from tests/intel/core_4th_gen/haswell-i3.test
rename to tests/intel/x86-64/haswell/haswell-core-i3.test
diff --git a/tests/intel/core_4th_gen/haswell-i5.test b/tests/intel/x86-64/haswell/haswell-core-i5.test
similarity index 100%
rename from tests/intel/core_4th_gen/haswell-i5.test
rename to tests/intel/x86-64/haswell/haswell-core-i5.test
diff --git a/tests/intel/core_4th_gen/haswell-i7.test b/tests/intel/x86-64/haswell/haswell-core-i7.test
similarity index 100%
rename from tests/intel/core_4th_gen/haswell-i7.test
rename to tests/intel/x86-64/haswell/haswell-core-i7.test
diff --git a/tests/intel/core_1st_gen/arrandale-i5.test b/tests/intel/x86-64/nehalem/arrandale-core-i5.test
similarity index 100%
rename from tests/intel/core_1st_gen/arrandale-i5.test
rename to tests/intel/x86-64/nehalem/arrandale-core-i5.test
diff --git a/tests/intel/core_1st_gen/arrandale-i7.test b/tests/intel/x86-64/nehalem/arrandale-core-i7.test
similarity index 100%
rename from tests/intel/core_1st_gen/arrandale-i7.test
rename to tests/intel/x86-64/nehalem/arrandale-core-i7.test
diff --git a/tests/intel/core_1st_gen/arrandale-mobile.test b/tests/intel/x86-64/nehalem/arrandale-pentium.test
similarity index 100%
rename from tests/intel/core_1st_gen/arrandale-mobile.test
rename to tests/intel/x86-64/nehalem/arrandale-pentium.test
diff --git a/tests/intel/core_1st_gen/bloomfield.test b/tests/intel/x86-64/nehalem/bloomfield-core-i7.test
similarity index 100%
rename from tests/intel/core_1st_gen/bloomfield.test
rename to tests/intel/x86-64/nehalem/bloomfield-core-i7.test
diff --git a/tests/intel/core_1st_gen/xeon-bloomfield.test b/tests/intel/x86-64/nehalem/bloomfield-xeon.test
similarity index 100%
rename from tests/intel/core_1st_gen/xeon-bloomfield.test
rename to tests/intel/x86-64/nehalem/bloomfield-xeon.test
diff --git a/tests/intel/core_1st_gen/xeon-gainestown.test b/tests/intel/x86-64/nehalem/gainestown-xeon.test
similarity index 100%
rename from tests/intel/core_1st_gen/xeon-gainestown.test
rename to tests/intel/x86-64/nehalem/gainestown-xeon.test
diff --git a/tests/intel/core_1st_gen/gulftown-i7.test b/tests/intel/x86-64/nehalem/gulftown-core-i7.test
similarity index 100%
rename from tests/intel/core_1st_gen/gulftown-i7.test
rename to tests/intel/x86-64/nehalem/gulftown-core-i7.test
diff --git a/tests/intel/core_1st_gen/xeon-gulftown.test b/tests/intel/x86-64/nehalem/gulftown-xeon.test
similarity index 100%
rename from tests/intel/core_1st_gen/xeon-gulftown.test
rename to tests/intel/x86-64/nehalem/gulftown-xeon.test
diff --git a/tests/intel/core_1st_gen/lynnfield-i5.test b/tests/intel/x86-64/nehalem/lynnfield-core-i5.test
similarity index 100%
rename from tests/intel/core_1st_gen/lynnfield-i5.test
rename to tests/intel/x86-64/nehalem/lynnfield-core-i5.test
diff --git a/tests/intel/core_1st_gen/lynnfield-i7.test b/tests/intel/x86-64/nehalem/lynnfield-core-i7.test
similarity index 100%
rename from tests/intel/core_1st_gen/lynnfield-i7.test
rename to tests/intel/x86-64/nehalem/lynnfield-core-i7.test
diff --git a/tests/intel/core_13th_gen/raptor-lake-p-i7.test b/tests/intel/x86-64/raptor-cove/raptor-lake-p-core-i7.test
similarity index 100%
rename from tests/intel/core_13th_gen/raptor-lake-p-i7.test
rename to tests/intel/x86-64/raptor-cove/raptor-lake-p-core-i7.test
diff --git a/tests/intel/core_13th_gen/raptor-lake-s-i5.test b/tests/intel/x86-64/raptor-cove/raptor-lake-s-core-i5.test
similarity index 100%
rename from tests/intel/core_13th_gen/raptor-lake-s-i5.test
rename to tests/intel/x86-64/raptor-cove/raptor-lake-s-core-i5.test
diff --git a/tests/intel/core_13th_gen/raptor-lake-s-i7.test b/tests/intel/x86-64/raptor-cove/raptor-lake-s-core-i7.test
similarity index 100%
rename from tests/intel/core_13th_gen/raptor-lake-s-i7.test
rename to tests/intel/x86-64/raptor-cove/raptor-lake-s-core-i7.test
diff --git a/tests/intel/core_13th_gen/raptor-lake-s-i9.test b/tests/intel/x86-64/raptor-cove/raptor-lake-s-core-i9.test
similarity index 100%
rename from tests/intel/core_13th_gen/raptor-lake-s-i9.test
rename to tests/intel/x86-64/raptor-cove/raptor-lake-s-core-i9.test
diff --git a/tests/intel/core_13th_gen/raptor-lake-u-i7.test b/tests/intel/x86-64/raptor-cove/raptor-lake-u-core-i7.test
similarity index 100%
rename from tests/intel/core_13th_gen/raptor-lake-u-i7.test
rename to tests/intel/x86-64/raptor-cove/raptor-lake-u-core-i7.test
diff --git a/tests/intel/core_3rd_gen/ivy-bridge-i3.test b/tests/intel/x86-64/sandy-bridge/ivy-bridge-core-i3.test
similarity index 100%
rename from tests/intel/core_3rd_gen/ivy-bridge-i3.test
rename to tests/intel/x86-64/sandy-bridge/ivy-bridge-core-i3.test
diff --git a/tests/intel/core_3rd_gen/ivy-bridge-i5.test b/tests/intel/x86-64/sandy-bridge/ivy-bridge-core-i5.test
similarity index 100%
rename from tests/intel/core_3rd_gen/ivy-bridge-i5.test
rename to tests/intel/x86-64/sandy-bridge/ivy-bridge-core-i5.test
diff --git a/tests/intel/core_3rd_gen/xeon-e5.test b/tests/intel/x86-64/sandy-bridge/ivy-bridge-xeon-e5.test
similarity index 100%
rename from tests/intel/core_3rd_gen/xeon-e5.test
rename to tests/intel/x86-64/sandy-bridge/ivy-bridge-xeon-e5.test
diff --git a/tests/intel/core_2nd_gen/celeron-sandy.test b/tests/intel/x86-64/sandy-bridge/sandy-bridge-celeron.test
similarity index 100%
rename from tests/intel/core_2nd_gen/celeron-sandy.test
rename to tests/intel/x86-64/sandy-bridge/sandy-bridge-celeron.test
diff --git a/tests/intel/core_2nd_gen/sandy-bridge-i7.test b/tests/intel/x86-64/sandy-bridge/sandy-bridge-core-i7.test
similarity index 100%
rename from tests/intel/core_2nd_gen/sandy-bridge-i7.test
rename to tests/intel/x86-64/sandy-bridge/sandy-bridge-core-i7.test
diff --git a/tests/intel/core_2nd_gen/sandy-bridge-e-i7.test b/tests/intel/x86-64/sandy-bridge/sandy-bridge-e-core-i7.test
similarity index 100%
rename from tests/intel/core_2nd_gen/sandy-bridge-e-i7.test
rename to tests/intel/x86-64/sandy-bridge/sandy-bridge-e-core-i7.test
diff --git a/tests/intel/core_2nd_gen/xeon-sandy-e-e5.test b/tests/intel/x86-64/sandy-bridge/sandy-bridge-e-xeon-e5.test
similarity index 100%
rename from tests/intel/core_2nd_gen/xeon-sandy-e-e5.test
rename to tests/intel/x86-64/sandy-bridge/sandy-bridge-e-xeon-e5.test
diff --git a/tests/intel/core_2nd_gen/xeon-sandy-e3.test b/tests/intel/x86-64/sandy-bridge/sandy-bridge-xeon-e3.test
similarity index 100%
rename from tests/intel/core_2nd_gen/xeon-sandy-e3.test
rename to tests/intel/x86-64/sandy-bridge/sandy-bridge-xeon-e3.test
diff --git a/tests/intel/core_10th_gen/ice-lake-i3.test b/tests/intel/x86-64/skylake/cannon-lake-core-i3-u.test
similarity index 100%
rename from tests/intel/core_10th_gen/ice-lake-i3.test
rename to tests/intel/x86-64/skylake/cannon-lake-core-i3-u.test
diff --git a/tests/intel/skylake/cascade-lake-sp-xeon-gold.test b/tests/intel/x86-64/skylake/cascade-lake-sp-xeon-gold.test
similarity index 100%
rename from tests/intel/skylake/cascade-lake-sp-xeon-gold.test
rename to tests/intel/x86-64/skylake/cascade-lake-sp-xeon-gold.test
diff --git a/tests/intel/skylake/cascade-lake-sp-xeon-platinum.test b/tests/intel/x86-64/skylake/cascade-lake-sp-xeon-platinum.test
similarity index 100%
rename from tests/intel/skylake/cascade-lake-sp-xeon-platinum.test
rename to tests/intel/x86-64/skylake/cascade-lake-sp-xeon-platinum.test
diff --git a/tests/intel/skylake/cascade-lake-sp-xeon-silver.test b/tests/intel/x86-64/skylake/cascade-lake-sp-xeon-silver.test
similarity index 100%
rename from tests/intel/skylake/cascade-lake-sp-xeon-silver.test
rename to tests/intel/x86-64/skylake/cascade-lake-sp-xeon-silver.test
diff --git a/tests/intel/skylake/cascade-lake-w-xeon-w.test b/tests/intel/x86-64/skylake/cascade-lake-w-xeon-w.test
similarity index 100%
rename from tests/intel/skylake/cascade-lake-w-xeon-w.test
rename to tests/intel/x86-64/skylake/cascade-lake-w-xeon-w.test
diff --git a/tests/intel/skylake/cascade-lake-x-core-i9.test b/tests/intel/x86-64/skylake/cascade-lake-x-core-i9.test
similarity index 100%
rename from tests/intel/skylake/cascade-lake-x-core-i9.test
rename to tests/intel/x86-64/skylake/cascade-lake-x-core-i9.test
diff --git a/tests/intel/core_8th_gen/coffee-lake-i7.test b/tests/intel/x86-64/skylake/coffee-lake-core-i7.test
similarity index 100%
rename from tests/intel/core_8th_gen/coffee-lake-i7.test
rename to tests/intel/x86-64/skylake/coffee-lake-core-i7.test
diff --git a/tests/intel/core_10th_gen/comet-lake-i7-u.test b/tests/intel/x86-64/skylake/comet-lake-core-i7-u.test
similarity index 100%
rename from tests/intel/core_10th_gen/comet-lake-i7-u.test
rename to tests/intel/x86-64/skylake/comet-lake-core-i7-u.test
diff --git a/tests/intel/core_7th_gen/kaby-lake-i7-g.test b/tests/intel/x86-64/skylake/kaby-lake-core-i7-g.test
similarity index 100%
rename from tests/intel/core_7th_gen/kaby-lake-i7-g.test
rename to tests/intel/x86-64/skylake/kaby-lake-core-i7-g.test
diff --git a/tests/intel/core_7th_gen/kaby-lake-i7-u.test b/tests/intel/x86-64/skylake/kaby-lake-core-i7-u.test
similarity index 100%
rename from tests/intel/core_7th_gen/kaby-lake-i7-u.test
rename to tests/intel/x86-64/skylake/kaby-lake-core-i7-u.test
diff --git a/tests/intel/core_7th_gen/kaby-lake-refresh-i5.test b/tests/intel/x86-64/skylake/kaby-lake-r-core-i5.test
similarity index 100%
rename from tests/intel/core_7th_gen/kaby-lake-refresh-i5.test
rename to tests/intel/x86-64/skylake/kaby-lake-r-core-i5.test
diff --git a/tests/intel/core_6th_gen/skylake-i5.test b/tests/intel/x86-64/skylake/skylake-core-i5.test
similarity index 100%
rename from tests/intel/core_6th_gen/skylake-i5.test
rename to tests/intel/x86-64/skylake/skylake-core-i5.test
diff --git a/tests/intel/skylake/skylake-de-xeon-d.test b/tests/intel/x86-64/skylake/skylake-de-xeon-d.test
similarity index 100%
rename from tests/intel/skylake/skylake-de-xeon-d.test
rename to tests/intel/x86-64/skylake/skylake-de-xeon-d.test
diff --git a/tests/intel/core_6th_gen/skylake-pentium.test b/tests/intel/x86-64/skylake/skylake-pentium.test
similarity index 100%
rename from tests/intel/core_6th_gen/skylake-pentium.test
rename to tests/intel/x86-64/skylake/skylake-pentium.test
diff --git a/tests/intel/skylake/skylake-sp-xeon-bronze.test b/tests/intel/x86-64/skylake/skylake-sp-xeon-bronze.test
similarity index 100%
rename from tests/intel/skylake/skylake-sp-xeon-bronze.test
rename to tests/intel/x86-64/skylake/skylake-sp-xeon-bronze.test
diff --git a/tests/intel/skylake/skylake-sp-xeon-gold.test b/tests/intel/x86-64/skylake/skylake-sp-xeon-gold.test
similarity index 100%
rename from tests/intel/skylake/skylake-sp-xeon-gold.test
rename to tests/intel/x86-64/skylake/skylake-sp-xeon-gold.test
diff --git a/tests/intel/skylake/skylake-sp-xeon-platinum.test b/tests/intel/x86-64/skylake/skylake-sp-xeon-platinum.test
similarity index 100%
rename from tests/intel/skylake/skylake-sp-xeon-platinum.test
rename to tests/intel/x86-64/skylake/skylake-sp-xeon-platinum.test
diff --git a/tests/intel/skylake/skylake-sp-xeon-silver.test b/tests/intel/x86-64/skylake/skylake-sp-xeon-silver.test
similarity index 100%
rename from tests/intel/skylake/skylake-sp-xeon-silver.test
rename to tests/intel/x86-64/skylake/skylake-sp-xeon-silver.test
diff --git a/tests/intel/skylake/skylake-w-xeon-w.test b/tests/intel/x86-64/skylake/skylake-w-xeon-w.test
similarity index 100%
rename from tests/intel/skylake/skylake-w-xeon-w.test
rename to tests/intel/x86-64/skylake/skylake-w-xeon-w.test
diff --git a/tests/intel/core_6th_gen/skylake-x-i7.test b/tests/intel/x86-64/skylake/skylake-x-core-i7.test
similarity index 100%
rename from tests/intel/core_6th_gen/skylake-x-i7.test
rename to tests/intel/x86-64/skylake/skylake-x-core-i7.test
diff --git a/tests/intel/core_8th_gen/whiskey-lake-i5-u.test b/tests/intel/x86-64/skylake/whiskey-lake-core-i5-u.test
similarity index 100%
rename from tests/intel/core_8th_gen/whiskey-lake-i5-u.test
rename to tests/intel/x86-64/skylake/whiskey-lake-core-i5-u.test
diff --git a/tests/intel/sunny-cove/ice-lake-d-xeon-d.test b/tests/intel/x86-64/sunny-cove/ice-lake-d-xeon-d.test
similarity index 100%
rename from tests/intel/sunny-cove/ice-lake-d-xeon-d.test
rename to tests/intel/x86-64/sunny-cove/ice-lake-d-xeon-d.test
diff --git a/tests/intel/core_8th_gen/cannon-lake-i3-u.test b/tests/intel/x86-64/sunny-cove/ice-lake-i3.test
similarity index 100%
rename from tests/intel/core_8th_gen/cannon-lake-i3-u.test
rename to tests/intel/x86-64/sunny-cove/ice-lake-i3.test
diff --git a/tests/intel/core_10th_gen/ice-lake-i5.test b/tests/intel/x86-64/sunny-cove/ice-lake-i5.test
similarity index 100%
rename from tests/intel/core_10th_gen/ice-lake-i5.test
rename to tests/intel/x86-64/sunny-cove/ice-lake-i5.test
diff --git a/tests/intel/core_10th_gen/ice-lake-i7.test b/tests/intel/x86-64/sunny-cove/ice-lake-i7.test
similarity index 100%
rename from tests/intel/core_10th_gen/ice-lake-i7.test
rename to tests/intel/x86-64/sunny-cove/ice-lake-i7.test
diff --git a/tests/intel/core_11th_gen/tiger-lake-i5.test b/tests/intel/x86-64/willow-cove/tiger-lake-core-i5.test
similarity index 100%
rename from tests/intel/core_11th_gen/tiger-lake-i5.test
rename to tests/intel/x86-64/willow-cove/tiger-lake-core-i5.test
diff --git a/tests/intel/atom/atom-diamondville-dualcore.test b/tests/intel/x86-atom/bonnell/diamondville-atom-330.test
similarity index 100%
rename from tests/intel/atom/atom-diamondville-dualcore.test
rename to tests/intel/x86-atom/bonnell/diamondville-atom-330.test
diff --git a/tests/intel/atom/atom-diamondville.test b/tests/intel/x86-atom/bonnell/diamondville-atom-n270.test
similarity index 100%
rename from tests/intel/atom/atom-diamondville.test
rename to tests/intel/x86-atom/bonnell/diamondville-atom-n270.test
diff --git a/tests/intel/atom/atom-pineview.test b/tests/intel/x86-atom/bonnell/pineview-atom-d425.test
similarity index 100%
rename from tests/intel/atom/atom-pineview.test
rename to tests/intel/x86-atom/bonnell/pineview-atom-d425.test
diff --git a/tests/intel/atom/atom-pineview-2.test b/tests/intel/x86-atom/bonnell/pineview-atom-d525.test
similarity index 100%
rename from tests/intel/atom/atom-pineview-2.test
rename to tests/intel/x86-atom/bonnell/pineview-atom-d525.test
diff --git a/tests/intel/atom/atom-pineview-3.test b/tests/intel/x86-atom/bonnell/pineview-atom-n450.test
similarity index 100%
rename from tests/intel/atom/atom-pineview-3.test
rename to tests/intel/x86-atom/bonnell/pineview-atom-n450.test
diff --git a/tests/intel/atom/celeron-gemini-lake.test b/tests/intel/x86-atom/goldmont-plus/gemini-lake-celeron.test
similarity index 100%
rename from tests/intel/atom/celeron-gemini-lake.test
rename to tests/intel/x86-atom/goldmont-plus/gemini-lake-celeron.test
diff --git a/tests/intel/atom/atom-cedarview-n2800.test b/tests/intel/x86-atom/saltwell/cedarview-atom.test
similarity index 100%
rename from tests/intel/atom/atom-cedarview-n2800.test
rename to tests/intel/x86-atom/saltwell/cedarview-atom.test
diff --git a/tests/intel/tremont/elkhart-lake-celeron.test b/tests/intel/x86-atom/tremont/elkhart-lake-celeron.test
similarity index 100%
rename from tests/intel/tremont/elkhart-lake-celeron.test
rename to tests/intel/x86-atom/tremont/elkhart-lake-celeron.test
diff --git a/tests/intel/tremont/jasper-lake-celeron.test b/tests/intel/x86-atom/tremont/jasper-lake-celeron.test
similarity index 100%
rename from tests/intel/tremont/jasper-lake-celeron.test
rename to tests/intel/x86-atom/tremont/jasper-lake-celeron.test
diff --git a/tests/intel/tremont/jasper-lake-pentium.test b/tests/intel/x86-atom/tremont/jasper-lake-pentium.test
similarity index 100%
rename from tests/intel/tremont/jasper-lake-pentium.test
rename to tests/intel/x86-atom/tremont/jasper-lake-pentium.test
diff --git a/tests/intel/tremont/lakefield-i5.test b/tests/intel/x86-atom/tremont/lakefield-core-i5.test
similarity index 100%
rename from tests/intel/tremont/lakefield-i5.test
rename to tests/intel/x86-atom/tremont/lakefield-core-i5.test