From bb6d7d402b5cc610ed879e9e7ecb251e353149e6 Mon Sep 17 00:00:00 2001 From: Nilay Vaish Date: Sat, 4 Jan 2014 00:03:33 -0600 Subject: [PATCH] ruby: rename MESI_CMP_directory to MESI_Two_Level This is because the next patch introduces a three level hierarchy. --HG-- rename : build_opts/ALPHA_MESI_CMP_directory => build_opts/ALPHA_MESI_Two_Level rename : build_opts/X86_MESI_CMP_directory => build_opts/X86_MESI_Two_Level rename : configs/ruby/MESI_CMP_directory.py => configs/ruby/MESI_Two_Level.py rename : src/mem/protocol/MESI_CMP_directory-L1cache.sm => src/mem/protocol/MESI_Two_Level-L1cache.sm rename : src/mem/protocol/MESI_CMP_directory-L2cache.sm => src/mem/protocol/MESI_Two_Level-L2cache.sm rename : src/mem/protocol/MESI_CMP_directory-dir.sm => src/mem/protocol/MESI_Two_Level-dir.sm rename : src/mem/protocol/MESI_CMP_directory-dma.sm => src/mem/protocol/MESI_Two_Level-dma.sm rename : src/mem/protocol/MESI_CMP_directory-msg.sm => src/mem/protocol/MESI_Two_Level-msg.sm rename : src/mem/protocol/MESI_CMP_directory.slicc => src/mem/protocol/MESI_Two_Level.slicc rename : tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/config.ini => tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/config.ini rename : tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/ruby.stats => tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/ruby.stats rename : tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/simerr => tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/simerr rename : tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/simout => tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/simout rename : tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/stats.txt => tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/stats.txt rename : tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/system.pc.com_1.terminal => tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/system.pc.com_1.terminal rename : tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/config.ini => tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/config.ini rename : tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/ruby.stats => tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/ruby.stats rename : tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/simerr => tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/simerr rename : tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/simout => tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/simout rename : tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/stats.txt => tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/stats.txt rename : tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/config.ini => tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/config.ini rename : tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/ruby.stats => tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/ruby.stats rename : tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/simerr => tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/simerr rename : tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/simout => tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/simout rename : tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/stats.txt => tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/stats.txt rename : tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/config.ini => tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_Two_Level/config.ini rename : tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/ruby.stats => tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_Two_Level/ruby.stats rename : tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/simerr => tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_Two_Level/simerr rename : tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/simout => tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_Two_Level/simout rename : tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/stats.txt => tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_Two_Level/stats.txt rename : tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/config.ini => tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_Two_Level/config.ini rename : tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/ruby.stats => tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_Two_Level/ruby.stats rename : tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/simerr => tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_Two_Level/simerr rename : tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/simout => tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_Two_Level/simout rename : tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/stats.txt => tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_Two_Level/stats.txt --- ...ESI_CMP_directory => ALPHA_MESI_Two_Level} | 2 +- ..._MESI_CMP_directory => X86_MESI_Two_Level} | 2 +- ...ESI_CMP_directory.py => MESI_Two_Level.py} | 20 +++++++++---------- src/mem/protocol/MESI_CMP_directory.slicc | 7 ------- ...y-L1cache.sm => MESI_Two_Level-L1cache.sm} | 0 ...y-L2cache.sm => MESI_Two_Level-L2cache.sm} | 0 ...directory-dir.sm => MESI_Two_Level-dir.sm} | 2 +- ...directory-dma.sm => MESI_Two_Level-dma.sm} | 0 ...directory-msg.sm => MESI_Two_Level-msg.sm} | 0 src/mem/protocol/MESI_Two_Level.slicc | 7 +++++++ src/mem/protocol/SConsopts | 2 +- .../config.ini | 0 .../ruby.stats | 0 .../simerr | 0 .../simout | 0 .../stats.txt | 0 .../system.pc.com_1.terminal | 0 .../config.ini | 0 .../ruby.stats | 0 .../simerr | 0 .../simout | 0 .../stats.txt | 0 .../config.ini | 0 .../ruby.stats | 0 .../simerr | 0 .../simout | 0 .../stats.txt | 0 .../config.ini | 0 .../ruby.stats | 0 .../simerr | 0 .../simout | 0 .../stats.txt | 0 .../config.ini | 0 .../ruby.stats | 0 .../simerr | 0 .../simout | 0 .../stats.txt | 0 util/regress | 4 ++-- 38 files changed, 23 insertions(+), 23 deletions(-) rename build_opts/{ALPHA_MESI_CMP_directory => ALPHA_MESI_Two_Level} (72%) rename build_opts/{X86_MESI_CMP_directory => X86_MESI_Two_Level} (69%) rename configs/ruby/{MESI_CMP_directory.py => MESI_Two_Level.py} (97%) delete mode 100644 src/mem/protocol/MESI_CMP_directory.slicc rename src/mem/protocol/{MESI_CMP_directory-L1cache.sm => MESI_Two_Level-L1cache.sm} (100%) rename src/mem/protocol/{MESI_CMP_directory-L2cache.sm => MESI_Two_Level-L2cache.sm} (100%) rename src/mem/protocol/{MESI_CMP_directory-dir.sm => MESI_Two_Level-dir.sm} (99%) rename src/mem/protocol/{MESI_CMP_directory-dma.sm => MESI_Two_Level-dma.sm} (100%) rename src/mem/protocol/{MESI_CMP_directory-msg.sm => MESI_Two_Level-msg.sm} (100%) create mode 100644 src/mem/protocol/MESI_Two_Level.slicc rename tests/long/fs/10.linux-boot/ref/x86/linux/{pc-simple-timing-ruby-MESI_CMP_directory => pc-simple-timing-ruby-MESI_Two_Level}/config.ini (100%) rename tests/long/fs/10.linux-boot/ref/x86/linux/{pc-simple-timing-ruby-MESI_CMP_directory => pc-simple-timing-ruby-MESI_Two_Level}/ruby.stats (100%) rename tests/long/fs/10.linux-boot/ref/x86/linux/{pc-simple-timing-ruby-MESI_CMP_directory => pc-simple-timing-ruby-MESI_Two_Level}/simerr (100%) rename tests/long/fs/10.linux-boot/ref/x86/linux/{pc-simple-timing-ruby-MESI_CMP_directory => pc-simple-timing-ruby-MESI_Two_Level}/simout (100%) rename tests/long/fs/10.linux-boot/ref/x86/linux/{pc-simple-timing-ruby-MESI_CMP_directory => pc-simple-timing-ruby-MESI_Two_Level}/stats.txt (100%) rename tests/long/fs/10.linux-boot/ref/x86/linux/{pc-simple-timing-ruby-MESI_CMP_directory => pc-simple-timing-ruby-MESI_Two_Level}/system.pc.com_1.terminal (100%) rename tests/quick/se/00.hello/ref/alpha/linux/{simple-timing-ruby-MESI_CMP_directory => simple-timing-ruby-MESI_Two_Level}/config.ini (100%) rename tests/quick/se/00.hello/ref/alpha/linux/{simple-timing-ruby-MESI_CMP_directory => simple-timing-ruby-MESI_Two_Level}/ruby.stats (100%) rename tests/quick/se/00.hello/ref/alpha/linux/{simple-timing-ruby-MESI_CMP_directory => simple-timing-ruby-MESI_Two_Level}/simerr (100%) rename tests/quick/se/00.hello/ref/alpha/linux/{simple-timing-ruby-MESI_CMP_directory => simple-timing-ruby-MESI_Two_Level}/simout (100%) rename tests/quick/se/00.hello/ref/alpha/linux/{simple-timing-ruby-MESI_CMP_directory => simple-timing-ruby-MESI_Two_Level}/stats.txt (100%) rename tests/quick/se/00.hello/ref/alpha/tru64/{simple-timing-ruby-MESI_CMP_directory => simple-timing-ruby-MESI_Two_Level}/config.ini (100%) rename tests/quick/se/00.hello/ref/alpha/tru64/{simple-timing-ruby-MESI_CMP_directory => simple-timing-ruby-MESI_Two_Level}/ruby.stats (100%) rename tests/quick/se/00.hello/ref/alpha/tru64/{simple-timing-ruby-MESI_CMP_directory => simple-timing-ruby-MESI_Two_Level}/simerr (100%) rename tests/quick/se/00.hello/ref/alpha/tru64/{simple-timing-ruby-MESI_CMP_directory => simple-timing-ruby-MESI_Two_Level}/simout (100%) rename tests/quick/se/00.hello/ref/alpha/tru64/{simple-timing-ruby-MESI_CMP_directory => simple-timing-ruby-MESI_Two_Level}/stats.txt (100%) rename tests/quick/se/50.memtest/ref/alpha/linux/{memtest-ruby-MESI_CMP_directory => memtest-ruby-MESI_Two_Level}/config.ini (100%) rename tests/quick/se/50.memtest/ref/alpha/linux/{memtest-ruby-MESI_CMP_directory => memtest-ruby-MESI_Two_Level}/ruby.stats (100%) rename tests/quick/se/50.memtest/ref/alpha/linux/{memtest-ruby-MESI_CMP_directory => memtest-ruby-MESI_Two_Level}/simerr (100%) rename tests/quick/se/50.memtest/ref/alpha/linux/{memtest-ruby-MESI_CMP_directory => memtest-ruby-MESI_Two_Level}/simout (100%) rename tests/quick/se/50.memtest/ref/alpha/linux/{memtest-ruby-MESI_CMP_directory => memtest-ruby-MESI_Two_Level}/stats.txt (100%) rename tests/quick/se/60.rubytest/ref/alpha/linux/{rubytest-ruby-MESI_CMP_directory => rubytest-ruby-MESI_Two_Level}/config.ini (100%) rename tests/quick/se/60.rubytest/ref/alpha/linux/{rubytest-ruby-MESI_CMP_directory => rubytest-ruby-MESI_Two_Level}/ruby.stats (100%) rename tests/quick/se/60.rubytest/ref/alpha/linux/{rubytest-ruby-MESI_CMP_directory => rubytest-ruby-MESI_Two_Level}/simerr (100%) rename tests/quick/se/60.rubytest/ref/alpha/linux/{rubytest-ruby-MESI_CMP_directory => rubytest-ruby-MESI_Two_Level}/simout (100%) rename tests/quick/se/60.rubytest/ref/alpha/linux/{rubytest-ruby-MESI_CMP_directory => rubytest-ruby-MESI_Two_Level}/stats.txt (100%) diff --git a/build_opts/ALPHA_MESI_CMP_directory b/build_opts/ALPHA_MESI_Two_Level similarity index 72% rename from build_opts/ALPHA_MESI_CMP_directory rename to build_opts/ALPHA_MESI_Two_Level index 32eeb0d11..e391f1fad 100644 --- a/build_opts/ALPHA_MESI_CMP_directory +++ b/build_opts/ALPHA_MESI_Two_Level @@ -1,3 +1,3 @@ SS_COMPATIBLE_FP = 1 CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU,InOrderCPU' -PROTOCOL = 'MESI_CMP_directory' +PROTOCOL = 'MESI_Two_Level' diff --git a/build_opts/X86_MESI_CMP_directory b/build_opts/X86_MESI_Two_Level similarity index 69% rename from build_opts/X86_MESI_CMP_directory rename to build_opts/X86_MESI_Two_Level index 882060ec3..fc74d6f01 100644 --- a/build_opts/X86_MESI_CMP_directory +++ b/build_opts/X86_MESI_Two_Level @@ -1,3 +1,3 @@ TARGET_ISA = 'x86' CPU_MODELS = 'TimingSimpleCPU,O3CPU,AtomicSimpleCPU' -PROTOCOL = 'MESI_CMP_directory' +PROTOCOL = 'MESI_Two_Level' diff --git a/configs/ruby/MESI_CMP_directory.py b/configs/ruby/MESI_Two_Level.py similarity index 97% rename from configs/ruby/MESI_CMP_directory.py rename to configs/ruby/MESI_Two_Level.py index 6408d1ed0..f7341f359 100644 --- a/configs/ruby/MESI_CMP_directory.py +++ b/configs/ruby/MESI_Two_Level.py @@ -49,12 +49,12 @@ def define_options(parser): return def create_system(options, system, piobus, dma_ports, ruby_system): - - if buildEnv['PROTOCOL'] != 'MESI_CMP_directory': - panic("This script requires the MESI_CMP_directory protocol to be built.") + + if buildEnv['PROTOCOL'] != 'MESI_Two_Level': + fatal("This script requires the MESI_Two_Level protocol to be built.") cpu_sequencers = [] - + # # The ruby network creation expects the list of nodes in the system to be # consistent with the NetDest list. Therefore the l1 controller nodes must be @@ -71,7 +71,7 @@ def create_system(options, system, piobus, dma_ports, ruby_system): # l2_bits = int(math.log(options.num_l2caches, 2)) block_size_bits = int(math.log(options.cacheline_size, 2)) - + for i in xrange(options.num_cpus): # # First create the Ruby objects associated with this cpu @@ -109,13 +109,13 @@ def create_system(options, system, piobus, dma_ports, ruby_system): cpu_seq.pio_port = piobus.slave exec("ruby_system.l1_cntrl%d = l1_cntrl" % i) - + # # Add controllers and sequencers to the appropriate lists # cpu_sequencers.append(cpu_seq) l1_cntrl_nodes.append(l1_cntrl) - + l2_index_start = block_size_bits + l2_bits for i in xrange(options.num_l2caches): @@ -130,10 +130,10 @@ def create_system(options, system, piobus, dma_ports, ruby_system): L2cache = l2_cache, transitions_per_cycle=options.ports, ruby_system = ruby_system) - + exec("ruby_system.l2_cntrl%d = l2_cntrl" % i) l2_cntrl_nodes.append(l2_cntrl) - + phys_mem_size = sum(map(lambda r: r.size(), system.mem_ranges)) assert(phys_mem_size % options.num_dirs == 0) mem_module_size = phys_mem_size / options.num_dirs @@ -177,7 +177,7 @@ def create_system(options, system, piobus, dma_ports, ruby_system): # dma_seq = DMASequencer(version = i, ruby_system = ruby_system) - + dma_cntrl = DMA_Controller(version = i, dma_sequencer = dma_seq, transitions_per_cycle = options.ports, diff --git a/src/mem/protocol/MESI_CMP_directory.slicc b/src/mem/protocol/MESI_CMP_directory.slicc deleted file mode 100644 index 37ac0a424..000000000 --- a/src/mem/protocol/MESI_CMP_directory.slicc +++ /dev/null @@ -1,7 +0,0 @@ -protocol "MESI_CMP_directory"; -include "RubySlicc_interfaces.slicc"; -include "MESI_CMP_directory-msg.sm"; -include "MESI_CMP_directory-L1cache.sm"; -include "MESI_CMP_directory-L2cache.sm"; -include "MESI_CMP_directory-dir.sm"; -include "MESI_CMP_directory-dma.sm"; diff --git a/src/mem/protocol/MESI_CMP_directory-L1cache.sm b/src/mem/protocol/MESI_Two_Level-L1cache.sm similarity index 100% rename from src/mem/protocol/MESI_CMP_directory-L1cache.sm rename to src/mem/protocol/MESI_Two_Level-L1cache.sm diff --git a/src/mem/protocol/MESI_CMP_directory-L2cache.sm b/src/mem/protocol/MESI_Two_Level-L2cache.sm similarity index 100% rename from src/mem/protocol/MESI_CMP_directory-L2cache.sm rename to src/mem/protocol/MESI_Two_Level-L2cache.sm diff --git a/src/mem/protocol/MESI_CMP_directory-dir.sm b/src/mem/protocol/MESI_Two_Level-dir.sm similarity index 99% rename from src/mem/protocol/MESI_CMP_directory-dir.sm rename to src/mem/protocol/MESI_Two_Level-dir.sm index 9418b75ac..9e503309e 100644 --- a/src/mem/protocol/MESI_CMP_directory-dir.sm +++ b/src/mem/protocol/MESI_Two_Level-dir.sm @@ -34,7 +34,7 @@ // Copied here by aep 12/14/07 -machine(Directory, "MESI_CMP_filter_directory protocol") +machine(Directory, "MESI Two Level directory protocol") : DirectoryMemory * directory, MemoryControl * memBuffer, Cycles to_mem_ctrl_latency = 1, diff --git a/src/mem/protocol/MESI_CMP_directory-dma.sm b/src/mem/protocol/MESI_Two_Level-dma.sm similarity index 100% rename from src/mem/protocol/MESI_CMP_directory-dma.sm rename to src/mem/protocol/MESI_Two_Level-dma.sm diff --git a/src/mem/protocol/MESI_CMP_directory-msg.sm b/src/mem/protocol/MESI_Two_Level-msg.sm similarity index 100% rename from src/mem/protocol/MESI_CMP_directory-msg.sm rename to src/mem/protocol/MESI_Two_Level-msg.sm diff --git a/src/mem/protocol/MESI_Two_Level.slicc b/src/mem/protocol/MESI_Two_Level.slicc new file mode 100644 index 000000000..b5bf104df --- /dev/null +++ b/src/mem/protocol/MESI_Two_Level.slicc @@ -0,0 +1,7 @@ +protocol "MESI_Two_Level"; +include "RubySlicc_interfaces.slicc"; +include "MESI_Two_Level-msg.sm"; +include "MESI_Two_Level-L1cache.sm"; +include "MESI_Two_Level-L2cache.sm"; +include "MESI_Two_Level-dir.sm"; +include "MESI_Two_Level-dma.sm"; diff --git a/src/mem/protocol/SConsopts b/src/mem/protocol/SConsopts index 95b043bc5..923f032fb 100644 --- a/src/mem/protocol/SConsopts +++ b/src/mem/protocol/SConsopts @@ -33,7 +33,7 @@ import os Import('*') all_protocols.extend([ - 'MESI_CMP_directory', + 'MESI_Two_Level', 'MI_example', 'MOESI_CMP_directory', 'MOESI_CMP_token', diff --git a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/config.ini b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/config.ini similarity index 100% rename from tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/config.ini rename to tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/config.ini diff --git a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/ruby.stats b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/ruby.stats similarity index 100% rename from tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/ruby.stats rename to tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/ruby.stats diff --git a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/simerr b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/simerr similarity index 100% rename from tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/simerr rename to tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/simerr diff --git a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/simout b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/simout similarity index 100% rename from tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/simout rename to tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/simout diff --git a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/stats.txt b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/stats.txt similarity index 100% rename from tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/stats.txt rename to tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/stats.txt diff --git a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/system.pc.com_1.terminal b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/system.pc.com_1.terminal similarity index 100% rename from tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/system.pc.com_1.terminal rename to tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/system.pc.com_1.terminal diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/config.ini b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/config.ini similarity index 100% rename from tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/config.ini rename to tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/config.ini diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/ruby.stats b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/ruby.stats similarity index 100% rename from tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/ruby.stats rename to tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/ruby.stats diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/simerr b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/simerr similarity index 100% rename from tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/simerr rename to tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/simerr diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/simout b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/simout similarity index 100% rename from tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/simout rename to tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/simout diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/stats.txt b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/stats.txt similarity index 100% rename from tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/stats.txt rename to tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/stats.txt diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/config.ini b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/config.ini similarity index 100% rename from tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/config.ini rename to tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/config.ini diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/ruby.stats b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/ruby.stats similarity index 100% rename from tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/ruby.stats rename to tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/ruby.stats diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/simerr b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/simerr similarity index 100% rename from tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/simerr rename to tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/simerr diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/simout b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/simout similarity index 100% rename from tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/simout rename to tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/simout diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/stats.txt b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/stats.txt similarity index 100% rename from tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/stats.txt rename to tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/stats.txt diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/config.ini b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_Two_Level/config.ini similarity index 100% rename from tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/config.ini rename to tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_Two_Level/config.ini diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/ruby.stats b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_Two_Level/ruby.stats similarity index 100% rename from tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/ruby.stats rename to tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_Two_Level/ruby.stats diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/simerr b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_Two_Level/simerr similarity index 100% rename from tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/simerr rename to tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_Two_Level/simerr diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/simout b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_Two_Level/simout similarity index 100% rename from tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/simout rename to tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_Two_Level/simout diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/stats.txt b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_Two_Level/stats.txt similarity index 100% rename from tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/stats.txt rename to tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_Two_Level/stats.txt diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/config.ini b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_Two_Level/config.ini similarity index 100% rename from tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/config.ini rename to tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_Two_Level/config.ini diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/ruby.stats b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_Two_Level/ruby.stats similarity index 100% rename from tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/ruby.stats rename to tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_Two_Level/ruby.stats diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/simerr b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_Two_Level/simerr similarity index 100% rename from tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/simerr rename to tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_Two_Level/simerr diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/simout b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_Two_Level/simout similarity index 100% rename from tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/simout rename to tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_Two_Level/simout diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/stats.txt b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_Two_Level/stats.txt similarity index 100% rename from tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/stats.txt rename to tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_Two_Level/stats.txt diff --git a/util/regress b/util/regress index 2ed2b6970..3cb078349 100755 --- a/util/regress +++ b/util/regress @@ -41,14 +41,14 @@ add_option('-v', '--verbose', action='store_true', default=False, help='echo commands before executing') add_option('--builds', default='ALPHA,ALPHA_MOESI_hammer,' \ - 'ALPHA_MESI_CMP_directory,' \ + 'ALPHA_MESI_Two_Level,' \ 'ALPHA_MOESI_CMP_directory,' \ 'ALPHA_MOESI_CMP_token,' \ 'MIPS,' \ 'NULL,' \ 'POWER,' \ 'SPARC,' \ - 'X86,X86_MESI_CMP_directory,' \ + 'X86,X86_MESI_Two_Level,' \ 'ARM', help="comma-separated build targets to test (default: '%default')") add_option('--modes', -- 2.30.2