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

1 files changed, 139 insertions, 0 deletions

diff --git a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/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
new file mode 100644
index 000000000..928f58e3e
--- /dev/null
+++ b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/system.pc.com_1.terminal
@@ -0,0 +1,139 @@
+Linux version 2.6.22.9 (gblack@fajita) (gcc version 4.1.2 (Gentoo 4.1.2 p1.1)) #12 SMP Fri Feb 27 22:10:33 PST 2009

+Command line: earlyprintk=ttyS0 console=ttyS0 lpj=7999923 root=/dev/hda1

+BIOS-provided physical RAM map:

+ BIOS-e820: 0000000000000000 - 000000000009fc00 (usable)

+ BIOS-e820: 000000000009fc00 - 0000000000100000 (reserved)

+ BIOS-e820: 0000000000100000 - 0000000008000000 (usable)

+ BIOS-e820: 00000000ffff0000 - 0000000100000000 (reserved)

+end_pfn_map = 1048576

+kernel direct mapping tables up to 100000000 @ 8000-d000

+DMI 2.5 present.

+Zone PFN ranges:

+  DMA             0 ->     4096

+  DMA32        4096 ->  1048576

+  Normal    1048576 ->  1048576

+early_node_map[2] active PFN ranges

+    0:        0 ->      159

+    0:      256 ->    32768

+Intel MultiProcessor Specification v1.4

+MPTABLE: OEM ID:  MPTABLE: Product ID:  MPTABLE: APIC at: 0xFEE00000

+Processor #0 (Bootup-CPU)

+Processor #1

+I/O APIC #2 at 0xFEC00000.

+Setting APIC routing to flat

+Processors: 2

+Allocating PCI resources starting at 10000000 (gap: 8000000:f7ff0000)

+PERCPU: Allocating 34160 bytes of per cpu data

+Built 1 zonelists.  Total pages: 30615

+Kernel command line: earlyprintk=ttyS0 console=ttyS0 lpj=7999923 root=/dev/hda1

+Initializing CPU#0

+PID hash table entries: 512 (order: 9, 4096 bytes)

+Marking TSC unstable due to TSCs unsynchronized

+time.c: Detected 2000.000 MHz processor.

+Console: colour dummy device 80x25

+console handover: boot [earlyser0] -> real [ttyS0]

+Dentry cache hash table entries: 16384 (order: 5, 131072 bytes)

+Inode-cache hash table entries: 8192 (order: 4, 65536 bytes)

+Checking aperture...

+Memory: 122004k/131072k available (3699k kernel code, 8516k reserved, 1767k data, 248k init)

+Calibrating delay loop (skipped)... 3999.96 BogoMIPS preset

+Mount-cache hash table entries: 256

+CPU: L1 I Cache: 64K (64 bytes/line), D cache 64K (64 bytes/line)

+CPU: L2 Cache: 1024K (64 bytes/line)

+Freeing SMP alternatives: 34k freed

+Using local APIC timer interrupts.

+result 7812500

+Detected 7.812 MHz APIC timer.

+Booting processor 1/2 APIC 0x1

+Initializing CPU#1

+Calibrating delay loop (skipped)... 3999.96 BogoMIPS preset

+CPU: L1 I Cache: 64K (64 bytes/line), D cache 64K (64 bytes/line)

+CPU: L2 Cache: 1024K (64 bytes/line)

+Fake M5 x86_64 CPU stepping 01

+Brought up 2 CPUs

+migration_cost=11

+NET: Registered protocol family 16

+PCI: Using configuration type 1

+SCSI subsystem initialized

+usbcore: registered new interface driver usbfs

+usbcore: registered new interface driver hub

+usbcore: registered new device driver usb

+PCI: Probing PCI hardware

+PCI-GART: No AMD northbridge found.

+NET: Registered protocol family 2

+IP route cache hash table entries: 1024 (order: 1, 8192 bytes)

+TCP established hash table entries: 4096 (order: 4, 98304 bytes)

+TCP bind hash table entries: 4096 (order: 4, 65536 bytes)

+TCP: Hash tables configured (established 4096 bind 4096)

+TCP reno registered

+Total HugeTLB memory allocated, 0

+Installing knfsd (copyright (C) 1996 okir@monad.swb.de).

+io scheduler noop registered

+io scheduler deadline registered

+io scheduler cfq registered (default)

+Real Time Clock Driver v1.12ac

+Linux agpgart interface v0.102 (c) Dave Jones

+Serial: 8250/16550 driver $Revision: 1.90 $ 4 ports, IRQ sharing disabled

+serial8250: ttyS0 at I/O 0x3f8 (irq = 4) is a 8250

+floppy0: no floppy controllers found

+RAMDISK driver initialized: 16 RAM disks of 4096K size 1024 blocksize

+loop: module loaded

+Intel(R) PRO/1000 Network Driver - version 7.3.20-k2

+Copyright (c) 1999-2006 Intel Corporation.

+e100: Intel(R) PRO/100 Network Driver, 3.5.17-k4-NAPI

+e100: Copyright(c) 1999-2006 Intel Corporation

+forcedeth.c: Reverse Engineered nForce ethernet driver. Version 0.60.

+tun: Universal TUN/TAP device driver, 1.6

+tun: (C) 1999-2004 Max Krasnyansky <maxk@qualcomm.com>

+netconsole: not configured, aborting

+Uniform Multi-Platform E-IDE driver Revision: 7.00alpha2

+ide: Assuming 33MHz system bus speed for PIO modes; override with idebus=xx

+PIIX4: IDE controller at PCI slot 0000:00:04.0

+PCI: Enabling device 0000:00:04.0 (0000 -> 0001)

+PIIX4: chipset revision 0

+PIIX4: not 100% native mode: will probe irqs later

+    ide0: BM-DMA at 0x1000-0x1007, BIOS settings: hda:DMA, hdb:DMA

+    ide1: BM-DMA at 0x1008-0x100f, BIOS settings: hdc:DMA, hdd:DMA

+hda: M5 IDE Disk, ATA DISK drive

+hdb: M5 IDE Disk, ATA DISK drive

+ide0 at 0x1f0-0x1f7,0x3f6 on irq 14

+hda: max request size: 128KiB

+hda: 1048320 sectors (536 MB), CHS=1040/16/63, UDMA(33)

+ hda: hda1

+hdb: max request size: 128KiB

+hdb: 4177920 sectors (2139 MB), CHS=4144/16/63, UDMA(33)

+ hdb: unknown partition table

+megaraid cmm: 2.20.2.7 (Release Date: Sun Jul 16 00:01:03 EST 2006)

+megaraid: 2.20.5.1 (Release Date: Thu Nov 16 15:32:35 EST 2006)

+megasas: 00.00.03.10-rc5 Thu May 17 10:09:32 PDT 2007

+Fusion MPT base driver 3.04.04

+Copyright (c) 1999-2007 LSI Logic Corporation

+Fusion MPT SPI Host driver 3.04.04

+Fusion MPT SAS Host driver 3.04.04

+ieee1394: raw1394: /dev/raw1394 device initialized

+USB Universal Host Controller Interface driver v3.0

+usbcore: registered new interface driver usblp

+drivers/usb/class/usblp.c: v0.13: USB Printer Device Class driver

+Initializing USB Mass Storage driver...

+usbcore: registered new interface driver usb-storage

+USB Mass Storage support registered.

+serio: i8042 KBD port at 0x60,0x64 irq 1

+serio: i8042 AUX port at 0x60,0x64 irq 12

+mice: PS/2 mouse device common for all mice

+input: AT Translated Set 2 keyboard as /class/input/input0

+device-mapper: ioctl: 4.11.0-ioctl (2006-10-12) initialised: dm-devel@redhat.com

+usbcore: registered new interface driver usbhid

+drivers/hid/usbhid/hid-core.c: v2.6:USB HID core driver

+oprofile: using timer interrupt.

+TCP cubic registered

+NET: Registered protocol family 1

+NET: Registered protocol family 10

+IPv6 over IPv4 tunneling driver

+input: PS/2 Generic Mouse as /class/input/input1

+NET: Registered protocol family 17

+EXT2-fs warning: mounting unchecked fs, running e2fsck is recommended

+VFS: Mounted root (ext2 filesystem).

+Freeing unused kernel memory: 248k freed

+
INIT: version 2.86 booting


+mounting filesystems...

+loading script...