changeset 0011560d49b0 in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=0011560d49b0
description:
ruby: remove unnecessary code.
1) Removing files from the ruby build left some unresovled
symbols. Those have been fixed.
2) Most of the dependencies on Simics data types and the simics
interface files have been removed.
3) Almost all mention of opal is gone.
4) Huge chunks of LogTM are now gone.
5) Handling 1-4 left ~hundreds of unresolved references, which were
fixed, yielding a snowball effect (and the massive size of this
delta).
diffstat:
43 files changed, 505 insertions(+), 9428 deletions(-)
src/mem/gems_common/ioutil/FakeSimicsDataTypes.hh | 63
src/mem/gems_common/ioutil/confio.cc | 2
src/mem/gems_common/ioutil/initvar.cc | 40
src/mem/gems_common/ioutil/initvar.hh | 12
src/mem/protocol/LogTM.sm | 83
src/mem/protocol/MESI_CMP_filter_directory-L1cache.sm | 1800 --------
src/mem/protocol/MESI_CMP_filter_directory-L2cache.sm | 2123 ----------
src/mem/protocol/MESI_CMP_filter_directory-mem.sm | 166
src/mem/protocol/MESI_CMP_filter_directory-msg.sm | 153
src/mem/protocol/MESI_CMP_filter_directory.slicc | 7
src/mem/protocol/MESI_CMP_filter_directory_m-mem.sm | 250 -
src/mem/protocol/MESI_CMP_filter_directory_m.slicc | 7
src/mem/ruby/FakeSimicsDataTypes.hh | 63
src/mem/ruby/config/RubyConfig.cc | 2
src/mem/ruby/config/config.hh | 2
src/mem/ruby/config/rubyconfig.defaults | 2
src/mem/ruby/config/tester.defaults | 2
src/mem/ruby/init.cc | 244 -
src/mem/ruby/init.hh | 10
src/mem/ruby/interfaces/OpalInterface.cc | 446 --
src/mem/ruby/interfaces/OpalInterface.hh | 214 -
src/mem/ruby/network/garnet-flexible-pipeline/NetworkConfig.hh | 3
src/mem/ruby/network/simple/Topology.cc | 3
src/mem/ruby/profiler/Profiler.cc | 1319 ------
src/mem/ruby/profiler/Profiler.hh | 509 --
src/mem/ruby/recorder/CacheRecorder.cc | 36
src/mem/ruby/simics/commands.cc | 867 ----
src/mem/ruby/simics/commands.hh | 106
src/mem/ruby/simics/interface.cc | 935 ----
src/mem/ruby/simics/interface.hh | 152
src/mem/ruby/simics/simics_api_dummy.c | 105
src/mem/ruby/system/DirectoryMemory.cc | 10
src/mem/ruby/system/PerfectCacheMemory.hh | 1
src/mem/ruby/system/PersistentArbiter.hh | 1
src/mem/ruby/system/Sequencer.cc | 155
src/mem/ruby/system/System.cc | 10
src/mem/ruby/system/System.hh | 3
src/mem/ruby/tester/DeterministicDriver.cc | 4
src/mem/ruby/tester/RaceyDriver.cc | 4
src/mem/ruby/tester/SyntheticDriver.cc | 4
src/mem/ruby/tester/Tester.cc | 4
src/mem/ruby/tester/main.cc | 4
src/mem/ruby/tester/test_framework.cc | 7
diffs (truncated from 10621 to 300 lines):
diff -r 705b277e1141 -r 0011560d49b0
src/mem/gems_common/ioutil/FakeSimicsDataTypes.hh
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/mem/gems_common/ioutil/FakeSimicsDataTypes.hh Mon May 11 10:38:45
2009 -0700
@@ -0,0 +1,63 @@
+#ifndef FAKE_SIMICS_DATA_TYPES_H
+#define FAKE_SIMICS_DATA_TYPES_H
+
+typedef struct attr_value attr_value_t;
+
+typedef enum {
+ Sim_Val_Invalid = 0,
+ Sim_Val_String = 1,
+ Sim_Val_Integer = 2,
+ Sim_Val_Floating = 3,
+ Sim_Val_List = 4,
+ Sim_Val_Data = 5,
+ Sim_Val_Nil = 6,
+ Sim_Val_Object = 7
+} attr_kind_t;
+
+typedef struct attr_list attr_list_t;
+
+struct attr_list {
+ int size;
+ struct attr_value *vector;
+};
+
+struct attr_value {
+ attr_kind_t kind;
+ union {
+ const char *string; /* Sim_Val_String */
+ unsigned long long integer; /* Sim_Val_Integer */
+ double floating; /* Sim_Val_Floating */
+ void *object; /* Sim_Val_Object */
+ attr_list_t list; /* Sim_Val_List */
+ } u;
+};
+
+typedef enum {
+Sim_Set_Ok,
+Sim_Set_Need_Integer,
+Sim_Set_Need_Floating,
+Sim_Set_Need_String,
+Sim_Set_Need_List,
+Sim_Set_Need_Data,
+Sim_Set_Need_Object,
+Sim_Set_Object_Not_Found,
+Sim_Set_Interface_Not_Found,
+Sim_Set_Illegal_Value,
+Sim_Set_Illegal_Type,
+Sim_Set_Illegal_Index,
+Sim_Set_Attribute_Not_Found,
+Sim_Set_Not_Writable,
+Sim_Set_Ignored
+} set_error_t;
+
+
+typedef attr_value_t (*get_attr_t)(void *ptr,
+ void *obj,
+ attr_value_t *idx);
+
+typedef set_error_t (*set_attr_t)(void *ptr,
+ void *obj,
+ attr_value_t *val,
+ attr_value_t *idx);
+
+#endif // #ifndef FAKE_SIMICS_DATA_TYPES_H
diff -r 705b277e1141 -r 0011560d49b0 src/mem/gems_common/ioutil/confio.cc
--- a/src/mem/gems_common/ioutil/confio.cc Mon May 11 10:38:45 2009 -0700
+++ b/src/mem/gems_common/ioutil/confio.cc Mon May 11 10:38:45 2009 -0700
@@ -59,8 +59,6 @@
// #endif
// };
-#include "FakeSimicsDataTypes.hh"
-
#include "confio.hh"
/*------------------------------------------------------------------------*/
diff -r 705b277e1141 -r 0011560d49b0 src/mem/gems_common/ioutil/initvar.cc
--- a/src/mem/gems_common/ioutil/initvar.cc Mon May 11 10:38:45 2009 -0700
+++ b/src/mem/gems_common/ioutil/initvar.cc Mon May 11 10:38:45 2009 -0700
@@ -70,8 +70,6 @@
// #endif
// };
-#include "FakeSimicsDataTypes.hh"
-
#include "Global.hh"
#include "confio.hh"
@@ -124,8 +122,7 @@
initvar_t::initvar_t( const char *name, const char *relativeIncludePath,
const char *initializingString,
void (*allocate_fn)(void),
- void (*my_generate_fn)(void),
- get_attr_t my_get_attr, set_attr_t my_set_attr )
+ void (*my_generate_fn)(void) )
{
m_is_init = false;
m_name = (char *) malloc( sizeof(char)*(strlen( name ) + 2) );
@@ -135,8 +132,6 @@
strcpy( m_rel_include_path, relativeIncludePath );
m_allocate_f = allocate_fn;
m_generate_values_f = my_generate_fn;
- m_my_get_attr = my_get_attr;
- m_my_set_attr = my_set_attr;
initvar_t::m_inst = this;
init_config_reader( initializingString );
@@ -247,7 +242,7 @@
}
//**************************************************************************
-attr_value_t initvar_t::dispatch_get( void *id, void *obj,
+int initvar_t::dispatch_get( void *id, void *obj,
attr_value_t *idx )
{
const char *command = (const char *) id;
@@ -256,13 +251,11 @@
DEBUG_OUT(" : you must initialize %s with a configuration file
first.\n", m_name);
DEBUG_OUT(" : use the command \'%s0.init\'\n", m_name);
- attr_value_t ret;
- ret.kind = Sim_Val_Invalid;
- ret.u.integer = 0;
- return ret;
+ return 0;
}
- return ((*m_my_get_attr)(id, obj, idx));
+ std::cerr << __FILE__ << "(" << __LINE__ << "): Not implmented." <<
std::endl;
+ return 0;
}
@@ -331,7 +324,9 @@
return Sim_Set_Illegal_Value;
}
- return (*m_my_set_attr)( id, obj, val, idx );
+
+ std::cerr << __FILE__ << "(" << __LINE__ << "): Not implmented." <<
std::endl;
+ return Sim_Set_Illegal_Value;
}
/*------------------------------------------------------------------------*/
@@ -588,22 +583,3 @@
return m_config_filename;
}
-/*------------------------------------------------------------------------*/
-/* Global functions */
-/*------------------------------------------------------------------------*/
-
-//**************************************************************************
-attr_value_t initvar_dispatch_get( void *id, void *obj,
- attr_value_t *idx )
-{
- initvar_t *init_obj = initvar_t::m_inst;
- return (init_obj->dispatch_get( id, obj, idx ));
-}
-
-//**************************************************************************
-set_error_t initvar_dispatch_set( void *id, void *obj,
- attr_value_t *val, attr_value_t *idx )
-{
- initvar_t *init_obj = initvar_t::m_inst;
- return (init_obj->dispatch_set( id, obj, val, idx ));
-}
diff -r 705b277e1141 -r 0011560d49b0 src/mem/gems_common/ioutil/initvar.hh
--- a/src/mem/gems_common/ioutil/initvar.hh Mon May 11 10:38:45 2009 -0700
+++ b/src/mem/gems_common/ioutil/initvar.hh Mon May 11 10:38:45 2009 -0700
@@ -70,8 +70,8 @@
initvar_t( const char *name, const char *relativeIncludePath,
const char *initializingString,
void (*allocate_fn)(void),
- void (*my_generate_fn)(void),
- get_attr_t my_get_attr, set_attr_t my_set_attr );
+ void (*my_generate_fn)(void)
+ );
/**
* Destructor: frees object.
@@ -96,8 +96,8 @@
const char *get_config_name( void );
/// calls through to the get_attr function, if object is initialized
- attr_value_t dispatch_get( void *id, void *obj,
- attr_value_t *idx );
+ int dispatch_get( void *id, void *obj,
+ attr_value_t *idx );
/** adds initialization attributes, calls through to the set_attr function,
* if object is initialized.
@@ -144,10 +144,6 @@
/// a pointer to the generate values function
void (*m_generate_values_f)(void);
- /// a pointer to the session get function
- get_attr_t m_my_get_attr;
- /// a pointer to the session set function
- set_attr_t m_my_set_attr;
};
diff -r 705b277e1141 -r 0011560d49b0 src/mem/protocol/LogTM.sm
--- a/src/mem/protocol/LogTM.sm Mon May 11 10:38:45 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 1999-2005 Mark D. Hill and David A. Wood
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met: redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer;
- * redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution;
- * neither the name of the copyright holders nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- This file has been modified by Kevin Moore and Dan Nussbaum of the
- Scalable Systems Research Group at Sun Microsystems Laboratories
- (http://research.sun.com/scalable/) to support the Adaptive
- Transactional Memory Test Platform (ATMTP).
-
- Please send email to [email protected] with feedback, questions, or
- to request future announcements about ATMTP.
-
- ----------------------------------------------------------------------
-
- File modification date: 2008-02-23
-
- ----------------------------------------------------------------------
-*/
-
-external_type(PartialAddressFilter, desc="Bloom filter for tracking
transaction locks."){
- bool isRead(Address);
- bool isWrite(Address);
-
- void addEntry(Address, bool);
- void clear();
-}
-
-external_type(TransactionInterfaceManager) {
- bool shouldNackLoad(Address, uint64, MachineID);
- bool shouldNackStore(Address, uint64, MachineID);
- bool checkReadWriteSignatures(Address);
- bool checkWriteSignatures(Address);
-
- void notifySendNack(Address, uint64, MachineID);
- void notifyReceiveNack(int, Address, uint64, uint64, MachineID);
- void notifyReceiveNackFinal(int, Address);
-
- uint64 getTimestamp(int);
- uint64 getOldestTimestamp();
-
- bool existGlobalLoadConflict(int, Address);
- bool existGlobalStoreConflict(int, Address);
-
- void profileTransactionMiss(int, bool);
-
- void xactReplacement(Address);
-
- /* DEPRECATED */
- bool existLoadConflict(Address);
- bool existStoreConflict(Address);
- bool isInReadFilterSummary(Address);
- bool isInWriteFilterSummary(Address);
- bool isTokenOwner(int);
- void setAbortFlag(int, Address);
- void setEnemyProcessor(int, MachineID);
- bool isRemoteOlder(uint64);
-
-}
diff -r 705b277e1141 -r 0011560d49b0
src/mem/protocol/MESI_CMP_filter_directory-L1cache.sm
--- a/src/mem/protocol/MESI_CMP_filter_directory-L1cache.sm Mon May 11
10:38:45 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1800 +0,0 @@
-
-/*
- * Copyright (c) 1999-2005 Mark D. Hill and David A. Wood
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev
