From 351e146b37c61481152ef3ad551b2dd30aa6127a Mon Sep 17 00:00:00 2001 From: Andreas Hansson Date: Wed, 3 Sep 2014 07:42:56 -0400 Subject: alpha: Stop using 'inorder' and rely entirely on 'minor' This patch avoids building the 'inorder' CPU model for any permutation of ALPHA, and also removes the ALPHA regressions using the 'inorder' CPU. The 'minor' CPU is already providing a broader test coverage. --- build_opts/ALPHA | 2 +- build_opts/ALPHA_MESI_Two_Level | 2 +- build_opts/ALPHA_MOESI_CMP_directory | 2 +- build_opts/ALPHA_MOESI_CMP_token | 2 +- build_opts/ALPHA_MOESI_hammer | 2 +- build_opts/ALPHA_Network_test | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'build_opts') diff --git a/build_opts/ALPHA b/build_opts/ALPHA index 4c327fa00..d1f82ce38 100644 --- a/build_opts/ALPHA +++ b/build_opts/ALPHA @@ -1,4 +1,4 @@ TARGET_ISA = 'alpha' SS_COMPATIBLE_FP = 1 -CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU,InOrderCPU,MinorCPU' +CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU,MinorCPU' PROTOCOL = 'MI_example' diff --git a/build_opts/ALPHA_MESI_Two_Level b/build_opts/ALPHA_MESI_Two_Level index e391f1fad..123b85d83 100644 --- a/build_opts/ALPHA_MESI_Two_Level +++ b/build_opts/ALPHA_MESI_Two_Level @@ -1,3 +1,3 @@ SS_COMPATIBLE_FP = 1 -CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU,InOrderCPU' +CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU,MinorCPU' PROTOCOL = 'MESI_Two_Level' diff --git a/build_opts/ALPHA_MOESI_CMP_directory b/build_opts/ALPHA_MOESI_CMP_directory index be42e636c..816453ea5 100644 --- a/build_opts/ALPHA_MOESI_CMP_directory +++ b/build_opts/ALPHA_MOESI_CMP_directory @@ -1,3 +1,3 @@ SS_COMPATIBLE_FP = 1 -CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU,InOrderCPU' +CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU,MinorCPU' PROTOCOL = 'MOESI_CMP_directory' diff --git a/build_opts/ALPHA_MOESI_CMP_token b/build_opts/ALPHA_MOESI_CMP_token index 0c94391fa..3851c5126 100644 --- a/build_opts/ALPHA_MOESI_CMP_token +++ b/build_opts/ALPHA_MOESI_CMP_token @@ -1,3 +1,3 @@ SS_COMPATIBLE_FP = 1 -CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU,InOrderCPU' +CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU,MinorCPU' PROTOCOL = 'MOESI_CMP_token' diff --git a/build_opts/ALPHA_MOESI_hammer b/build_opts/ALPHA_MOESI_hammer index 99e8f685b..4639cacda 100644 --- a/build_opts/ALPHA_MOESI_hammer +++ b/build_opts/ALPHA_MOESI_hammer @@ -1,3 +1,3 @@ SS_COMPATIBLE_FP = 1 -CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU,InOrderCPU' +CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU,MinorCPU' PROTOCOL = 'MOESI_hammer' diff --git a/build_opts/ALPHA_Network_test b/build_opts/ALPHA_Network_test index 90bec0c2f..011f81754 100644 --- a/build_opts/ALPHA_Network_test +++ b/build_opts/ALPHA_Network_test @@ -1,3 +1,3 @@ SS_COMPATIBLE_FP = 1 -CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU,InOrderCPU' +CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU,MinorCPU' PROTOCOL = 'Network_test' -- cgit v1.2.3