summaryrefslogtreecommitdiff
path: root/src/mem/protocol
diff options
context:
space:
mode:
authorBrad Beckmann <Brad.Beckmann@amd.com>2010-08-20 11:46:13 -0700
committerBrad Beckmann <Brad.Beckmann@amd.com>2010-08-20 11:46:13 -0700
commit6a4f99899b080b1afd68b0aaff24d2c2867b6c77 (patch)
tree1b4fcde90c323d60d7a1c40f7e1822c1a23e2bf4 /src/mem/protocol
parent984adf198ae60eb0d32d0818fc6233d4475b6eb1 (diff)
downloadgem5-6a4f99899b080b1afd68b0aaff24d2c2867b6c77.tar.xz
ruby: Resurrected Ruby's deterministic tests
Added the request series and invalidate deterministic tests as new cpu models and removed the no longer needed ruby tests --HG-- rename : configs/example/rubytest.py => configs/example/determ_test.py rename : src/mem/ruby/tester/DetermGETXGenerator.cc => src/cpu/directedtest/DirectedGenerator.cc rename : src/mem/ruby/tester/DetermGETXGenerator.hh => src/cpu/directedtest/DirectedGenerator.hh rename : src/mem/ruby/tester/DetermGETXGenerator.cc => src/cpu/directedtest/InvalidateGenerator.cc rename : src/mem/ruby/tester/DetermGETXGenerator.hh => src/cpu/directedtest/InvalidateGenerator.hh rename : src/cpu/rubytest/RubyTester.cc => src/cpu/directedtest/RubyDirectedTester.cc rename : src/cpu/rubytest/RubyTester.hh => src/cpu/directedtest/RubyDirectedTester.hh rename : src/mem/ruby/tester/DetermGETXGenerator.cc => src/cpu/directedtest/SeriesRequestGenerator.cc rename : src/mem/ruby/tester/DetermGETXGenerator.hh => src/cpu/directedtest/SeriesRequestGenerator.hh
Diffstat (limited to 'src/mem/protocol')
-rw-r--r--src/mem/protocol/RubySlicc_Exports.sm45
1 files changed, 9 insertions, 36 deletions
diff --git a/src/mem/protocol/RubySlicc_Exports.sm b/src/mem/protocol/RubySlicc_Exports.sm
index 4cea7c379..574307341 100644
--- a/src/mem/protocol/RubySlicc_Exports.sm
+++ b/src/mem/protocol/RubySlicc_Exports.sm
@@ -65,45 +65,18 @@ enumeration(TesterStatus, desc="...") {
Check_Pending, desc="Check Pending";
}
-// SpecifiedGeneratorTypes
-enumeration(SpecifiedGeneratorType, desc="...") {
- DetermGETXGenerator, desc="deterministic GETX Tester";
- DetermInvGenerator, desc="deterministic all shared then invalidate Tester";
- DetermSeriesGETSGenerator, desc="deterministic Series of GETSs Tester for prefetcher tuning";
+// InvalidateGeneratorStatus
+enumeration(InvalidateGeneratorStatus, desc="...") {
+ Load_Waiting, desc="Load waiting to be issued";
+ Load_Pending, desc="Load issued";
+ Inv_Waiting, desc="Store (invalidate) waiting to be issued";
+ Inv_Pending, desc="Store (invalidate) issued";
}
-// RequestGeneratorStatus
-enumeration(RequestGeneratorStatus, desc="...") {
- Thinking, desc="Doing work between release and next acquire";
- Test_Pending, desc="Test pending";
- Before_Swap, desc="We're about to perform the swap";
- Swap_Pending, desc="The swap used for test-and-send is pending";
- Holding, desc="We are holding the lock performing the critical section";
- Release_Pending, desc="The write for the release is pending";
- Done, desc="Done, waiting for end of run";
-}
-
-// DetermGETXGeneratorStatus
-enumeration(DetermGETXGeneratorStatus, desc="...") {
- Thinking, desc="Doing work before next action";
- Store_Pending, desc="Store pending";
- Done, desc="Done, waiting for end of run";
-}
-
-// DetermGETXGeneratorStatus
-enumeration(DetermInvGeneratorStatus, desc="...") {
- Thinking, desc="Doing work before next action";
- Store_Pending, desc="Store pending";
- Load_Complete, desc="Load complete";
- Load_Pending, desc="Load pending";
- Done, desc="Done, waiting for end of run";
-}
-
-// DetermSeriesGETSGeneratorStatus
-enumeration(DetermSeriesGETSGeneratorStatus, desc="...") {
+// SeriesRequestGeneratorStatus
+enumeration(SeriesRequestGeneratorStatus, desc="...") {
Thinking, desc="Doing work before next action";
- Load_Pending, desc="Load pending";
- Done, desc="Done, waiting for end of run";
+ Request_Pending, desc="Request pending";
}
// LockStatus