From 7816d0d12b87ace096dba5282be1f054c4615c95 Mon Sep 17 00:00:00 2001
From: Brad Beckmann <Brad.Beckmann@amd.com>
Date: Fri, 20 Aug 2010 11:41:35 -0700
Subject: [PATCH] config: moved python protocol config files

Moved the python protocol config files back to their original location to avoid
addToPath calls.

--HG--
rename : configs/ruby/protocols/MESI_CMP_directory.py => configs/ruby/MESI_CMP_directory.py
rename : configs/ruby/protocols/MI_example.py => configs/ruby/MI_example.py
rename : configs/ruby/protocols/MOESI_CMP_directory.py => configs/ruby/MOESI_CMP_directory.py
rename : configs/ruby/protocols/MOESI_CMP_token.py => configs/ruby/MOESI_CMP_token.py
rename : configs/ruby/protocols/MOESI_hammer.py => configs/ruby/MOESI_hammer.py
---
 configs/ruby/{protocols => }/MESI_CMP_directory.py  | 1 -
 configs/ruby/{protocols => }/MI_example.py          | 1 -
 configs/ruby/{protocols => }/MOESI_CMP_directory.py | 1 -
 configs/ruby/{protocols => }/MOESI_CMP_token.py     | 1 -
 configs/ruby/{protocols => }/MOESI_hammer.py        | 2 --
 configs/ruby/Ruby.py                                | 1 -
 6 files changed, 7 deletions(-)
 rename configs/ruby/{protocols => }/MESI_CMP_directory.py (99%)
 rename configs/ruby/{protocols => }/MI_example.py (99%)
 rename configs/ruby/{protocols => }/MOESI_CMP_directory.py (99%)
 rename configs/ruby/{protocols => }/MOESI_CMP_token.py (99%)
 rename configs/ruby/{protocols => }/MOESI_hammer.py (99%)

diff --git a/configs/ruby/protocols/MESI_CMP_directory.py b/configs/ruby/MESI_CMP_directory.py
similarity index 99%
rename from configs/ruby/protocols/MESI_CMP_directory.py
rename to configs/ruby/MESI_CMP_directory.py
index ca5a7aa46..9b62a15af 100644
--- a/configs/ruby/protocols/MESI_CMP_directory.py
+++ b/configs/ruby/MESI_CMP_directory.py
@@ -31,7 +31,6 @@ import math
 import m5
 from m5.objects import *
 from m5.defines import buildEnv
-from m5.util import addToPath
 
 #
 # Note: the L1 Cache latency is only used by the sequencer on fast path hits
diff --git a/configs/ruby/protocols/MI_example.py b/configs/ruby/MI_example.py
similarity index 99%
rename from configs/ruby/protocols/MI_example.py
rename to configs/ruby/MI_example.py
index f4033caeb..29d99b46e 100644
--- a/configs/ruby/protocols/MI_example.py
+++ b/configs/ruby/MI_example.py
@@ -30,7 +30,6 @@
 import m5
 from m5.objects import *
 from m5.defines import buildEnv
-from m5.util import addToPath
 
 #
 # Note: the cache latency is only used by the sequencer on fast path hits
diff --git a/configs/ruby/protocols/MOESI_CMP_directory.py b/configs/ruby/MOESI_CMP_directory.py
similarity index 99%
rename from configs/ruby/protocols/MOESI_CMP_directory.py
rename to configs/ruby/MOESI_CMP_directory.py
index 1cdb6c522..a4069d94d 100644
--- a/configs/ruby/protocols/MOESI_CMP_directory.py
+++ b/configs/ruby/MOESI_CMP_directory.py
@@ -31,7 +31,6 @@ import math
 import m5
 from m5.objects import *
 from m5.defines import buildEnv
-from m5.util import addToPath
 
 #
 # Note: the L1 Cache latency is only used by the sequencer on fast path hits
diff --git a/configs/ruby/protocols/MOESI_CMP_token.py b/configs/ruby/MOESI_CMP_token.py
similarity index 99%
rename from configs/ruby/protocols/MOESI_CMP_token.py
rename to configs/ruby/MOESI_CMP_token.py
index 849d5b62a..537a1543c 100644
--- a/configs/ruby/protocols/MOESI_CMP_token.py
+++ b/configs/ruby/MOESI_CMP_token.py
@@ -31,7 +31,6 @@ import math
 import m5
 from m5.objects import *
 from m5.defines import buildEnv
-from m5.util import addToPath
 
 #
 # Note: the L1 Cache latency is only used by the sequencer on fast path hits
diff --git a/configs/ruby/protocols/MOESI_hammer.py b/configs/ruby/MOESI_hammer.py
similarity index 99%
rename from configs/ruby/protocols/MOESI_hammer.py
rename to configs/ruby/MOESI_hammer.py
index e68a0e23f..2d2d75dc2 100644
--- a/configs/ruby/protocols/MOESI_hammer.py
+++ b/configs/ruby/MOESI_hammer.py
@@ -30,8 +30,6 @@
 import m5
 from m5.objects import *
 from m5.defines import buildEnv
-from m5.util import addToPath
-
 
 #
 # Note: the L1 Cache latency is only used by the sequencer on fast path hits
diff --git a/configs/ruby/Ruby.py b/configs/ruby/Ruby.py
index 5912b1cd5..66293af64 100644
--- a/configs/ruby/Ruby.py
+++ b/configs/ruby/Ruby.py
@@ -30,7 +30,6 @@
 import m5
 from m5.objects import *
 from m5.defines import buildEnv
-from m5.util import addToPath
 
 def create_system(options, physmem, piobus = None, dma_devices = []):