memHierarchy backend updates

src/sst/elements/memHierarchy/Makefile.am

@@ -130,7 +130,6 @@ libmemHierarchy_la_SOURCES = \
 EXTRA_DIST = \
 	membackend/ramulator2/Instructions.md \
 	membackend/ramulator2/sst_frontend.cpp \
-	tests/testsuite_default_memHierarchy_hybridsim.py \
 	tests/testsuite_default_memHierarchy_memHA.py \
 	tests/testsuite_default_memHierarchy_sdl.py \
 	tests/testsuite_default_memHierarchy_memory.py \
@@ -168,7 +167,6 @@ EXTRA_DIST = \
 	tests/sdl8-4.py \
 	tests/sdl9-1.py \
 	tests/sdl9-2.py \
-	tests/test_hybridsim.py \
 	tests/test_coherence_1core.py \
 	tests/test_coherence_2core_3level.py \
 	tests/test_coherence_4core_5level.py \
@@ -232,7 +230,6 @@ EXTRA_DIST = \
 	tests/hbm_system.ini \
 	tests/utils.py \
 	tests/mhlib.py \
-	tests/refFiles/test_hybridsim.out \
 	tests/refFiles/test_memHA_BackendChaining.out \
 	tests/refFiles/test_memHA_BackendDelayBuffer.out \
 	tests/refFiles/test_memHA_BackendDramsim3.out \
@@ -488,15 +485,6 @@ nobase_sst_HEADERS += membackend/HBMpagedMultiBackend.h
 
 endif
 
-if HAVE_HYBRIDSIM
-libmemHierarchy_la_LDFLAGS += $(HYBRIDSIM_LDFLAGS)
-libmemHierarchy_la_LIBADD += $(HYBRIDSIM_LIB)
-libmemHierarchy_la_SOURCES += membackend/hybridSimBackend.cc \
-	membackend/hybridSimBackend.h
-nobase_sst_HEADERS += membackend/hybridSimBackend.h
-AM_CPPFLAGS += $(HYBRIDSIM_CPPFLAGS) -DHAVE_LIBHYBRIDSIM
-endif
-
 if USE_LIBZ
 libmemHierarchy_la_LDFLAGS += $(LIBZ_LDFLAGS)
 libmemHierarchy_la_LIBADD += $(LIBZ_LIB)
@@ -513,8 +501,6 @@ libmemHierarchy_la_LIBADD += $(GOBLIN_HMCSIM_LIB)
 AM_CPPFLAGS += $(GOBLIN_HMCSIM_CPPFLAGS) -DHAVE_GOBLIN_HMCSIM
 endif
 
-
-
 if HAVE_FDSIM
 libmemHierarchy_la_SOURCES += \
 	membackend/flashSimBackend.cc \
@@ -530,8 +516,6 @@ install-exec-hook:
 	$(SST_REGISTER_TOOL) DRAMSIM LIBDIR=$(DRAMSIM_LIBDIR)
 	$(SST_REGISTER_TOOL) DRAMSIM3 LIBDIR=$(DRAMSIM3_LIBDIR)
 	$(SST_REGISTER_TOOL) HBMDRAMSIM LIBDIR=$(HBMDRAMSIM_LIBDIR)
-	$(SST_REGISTER_TOOL) HYBRIDSIM LIBDIR=$(HYBRIDSIM_LIBDIR)
-	$(SST_REGISTER_TOOL) NVDIMMSIM LIBDIR=$(NVDIMMSIM_LIBDIR)
 	$(SST_REGISTER_TOOL) FDSIM LIBDIR=$(FDSIM_LIBDIR)
 	$(SST_REGISTER_TOOL) GOBLIN_HMCSIM LIBDIR=$(GOBLIN_HMCSIM_LIBDIR)
 	$(SST_REGISTER_TOOL) RAMULATOR LIBDIR=$(RAMULATOR_LIBDIR)

src/sst/elements/memHierarchy/configure.m4

@@ -20,15 +20,9 @@ AC_DEFUN([SST_memHierarchy_CONFIG], [
   # Use global HBMDRAMSim check
   SST_CHECK_HBMDRAMSIM([],[],[AC_MSG_ERROR([HBM DRAMSim requested but could not be found])])
 
-  # Use global HybridSim check
-  SST_CHECK_HYBRIDSIM([],[],[AC_MSG_ERROR([HybridSim requested but could not be found])])
-
   # Use GOBLIN HMC Sim
   SST_CHECK_GOBLIN_HMCSIM([],[],[AC_MSG_ERROR([GOBLIN HMC Sim requested but could not be found])])
 
-  # Use NVDIMM Sim
-  SST_CHECK_NVDIMMSIM([],[],[AC_MSG_ERROR([NVDIMMSim requested but could not be found])])
-
   # Use FlashDIMMSim
   SST_CHECK_FDSIM([],[],[AC_MSG_ERROR([FlashDIMMSim requested but could not be found])])
 

src/sst/elements/memHierarchy/membackend/HBMpagedMultiBackend.cc

@@ -106,7 +106,7 @@ HBMpagedMultiMemory::HBMpagedMultiMemory(ComponentId_t id, Params &params)
 
     nanoConv = getTimeConverter("1ns");
 
-    minAccTime = self_link->getDefaultTimeBase()->getFactor() /
+    minAccTime = self_link->getDefaultTimeBase().getFactor() /
         nanoConv.getFactor();
 
     const uint32_t seed = params.find<uint32_t>("seed", 1447);

src/sst/elements/memHierarchy/membackend/goblinHMCBackend.h

@@ -229,6 +229,7 @@ class GOBLINHMCSimBackend : public ExtMemBackend {
         {"RowAccessTherm",      "HMC DRAM row access thermal",            "btus", 1} )
 
 /* Class definition */
+    [[deprecated("The gc64-hmcsim memory backend has been deprecated and will be removed in SST 17.")]]
         GOBLINHMCSimBackend(ComponentId_t id, Params& params);
 	~GOBLINHMCSimBackend();
 	bool issueRequest(ReqId, Addr, bool,

src/sst/elements/memHierarchy/membackend/pagedMultiBackend.cc

@@ -101,7 +101,7 @@ pagedMultiMemory::pagedMultiMemory(ComponentId_t id, Params &params) : DRAMSimMe
 
     nanoConv = getTimeConverter("1ns");
 
-    minAccTime = self_link->getDefaultTimeBase()->getFactor() /
+    minAccTime = self_link->getDefaultTimeBase().getFactor() /
         nanoConv.getFactor();
 
     const uint32_t seed = params.find<uint32_t>("seed", 1447);

src/sst/elements/memHierarchy/membackend/ramulatorBackend.h

@@ -40,6 +40,7 @@ class ramulatorMemory : public SimpleMemBackend {
             {"configFile",  "Name of the Ramulator Device config file", NULL} )
 
 /* Begin class definition */
+    [[deprecated("The Ramulator memory backend has been deprecated and will be removed in SST 17. Please switch to Ramulator2.")]]
     ramulatorMemory(ComponentId_t id, Params &params);
     bool issueRequest(ReqId, Addr, bool, unsigned );
     //virtual bool issueRequest(DRAMReq *req);