Made ConfigParser static

Pitt-JonesLab · Feb 13, 2024 · d5bb767 · d5bb767
1 parent 80df587
commit d5bb767
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 31 deletions.
diff --git a/src/Memory/MemoryFactory.cpp b/src/Memory/MemoryFactory.cpp
@@ -24,14 +24,12 @@ std::unique_ptr<SubArray>
 makeSimpleSubArray(const NVM::Simulation::Config& conf) {
     SimpleConfigs configs;
 
-    ConfigParser parser;
-    parser.registerValue<double>("PIMFaultRate", 0.0, &configs.pimFaultRate);
-    parser.registerValue<int>("NumTries", 1, &configs.numTries);
-    parser.registerValue<int>("NumCorrectableFaults", 0,
-                              &configs.numCorrectableFaults);
-    parser.registerValue<int>("WordSize", 64, &configs.wordSize);
-
-    parser.parse(conf);
+    ConfigParser::registerValue<double>("PIMFaultRate", 0.0,
+                                        &configs.pimFaultRate);
+    ConfigParser::registerValue<int>("NumTries", 1, &configs.numTries);
+    ConfigParser::registerValue<int>("NumCorrectableFaults", 0,
+                                     &configs.numCorrectableFaults);
+    ConfigParser::registerValue<int>("WordSize", 64, &configs.wordSize);
 
     FaultModel model(configs.pimFaultRate, configs.wordSize,
                      configs.numCorrectableFaults);

diff --git a/src/Utils/CMakeLists.txt b/src/Utils/CMakeLists.txt
@@ -1,6 +1,7 @@
 set(Utils_SOURCES
     Address.cpp
-    RowData.cpp)
+    RowData.cpp
+    ConfigParser.cpp)
 
 add_library(RTSim_Utils ${Utils_SOURCES})
 target_include_directories(RTSim_Utils PUBLIC ${RTSIM_DIR}/include PRIVATE ${RTSIM_DIR}/src)

diff --git a/src/Utils/ConfigParser.cpp b/src/Utils/ConfigParser.cpp
@@ -0,0 +1,8 @@
+#include "Utils/ConfigParser.h"
+
+using namespace NVM::Memory;
+
+bool ConfigParser::hasConfig = false;
+NVM::Simulation::Config ConfigParser::config;
+std::vector<std::function<void(const NVM::Simulation::Config&)>>
+    ConfigParser::parsers;
diff --git a/src/Utils/ConfigParser.h b/src/Utils/ConfigParser.h
@@ -14,14 +14,14 @@ class ConfigParser {
     ConfigParser() {}
 
     template<typename T>
-    void registerValue(std::string key, T defaultValue, T* destination) {
+    static void registerValue(std::string key, T defaultValue, T* destination) {
         using namespace NVM::Logging;
 
         log() << LogLevel::DEBUG << "Registering config value " << key
               << ", default is " << defaultValue << '\n';
 
-        parsers.push_back([key, defaultValue,
-                           destination](const NVM::Simulation::Config& conf) {
+        auto parseFunc = [key, defaultValue,
+                          destination](const NVM::Simulation::Config& conf) {
             try {
                 *destination = conf.get<T>(key);
                 log() << LogLevel::STAT << "Read config value " << key << " as "
@@ -31,15 +31,27 @@ class ConfigParser {
                       << key << " (" << defaultValue << ")\n";
                 *destination = defaultValue;
             }
-        });
+        };
+
+        if (hasConfig) {
+            parseFunc(config);
+        } else {
+            parsers.push_back(parseFunc);
+        }
     }
 
-    void parse(const NVM::Simulation::Config& conf) {
+    static void setConfig(const NVM::Simulation::Config& conf) {
+        config = conf;
         for (auto p : parsers) p(conf);
+        hasConfig = true;
     }
 
     private:
-    std::vector<std::function<void(const NVM::Simulation::Config&)>> parsers;
+    static std::vector<std::function<void(const NVM::Simulation::Config&)>>
+        parsers;
+
+    static NVM::Simulation::Config config;
+    static bool hasConfig;
 };
 
 } // namespace NVM::Memory
diff --git a/src/main/simpleMain.cpp b/src/main/simpleMain.cpp
@@ -23,29 +23,24 @@ ncycle_t getMaxCycles(char* arg) {
 }
 
 void setAddressScheme(const NVM::Simulation::Config& conf) {
-    ConfigParser parser;
     ComponentCounts counts;
 
-    parser.registerValue<unsigned int>("DBCS", 64, &counts.rows);
-    parser.registerValue<unsigned int>("DOMAINS", 512, &counts.cols);
-    parser.registerValue<unsigned int>("RANKS", 1, &counts.ranks);
-    parser.registerValue<unsigned int>("BANKS", 1, &counts.banks);
-    parser.registerValue<unsigned int>("CHANNELS", 1, &counts.channels);
+    ConfigParser::registerValue<unsigned int>("DBCS", 64, &counts.rows);
+    ConfigParser::registerValue<unsigned int>("DOMAINS", 512, &counts.cols);
+    ConfigParser::registerValue<unsigned int>("RANKS", 1, &counts.ranks);
+    ConfigParser::registerValue<unsigned int>("BANKS", 1, &counts.banks);
+    ConfigParser::registerValue<unsigned int>("CHANNELS", 1, &counts.channels);
 
     std::string addressScheme;
-    parser.registerValue<std::string>("AddressMappingScheme", "RK:BK:CH:R:C",
-                                      &addressScheme);
-
-    parser.parse(conf);
+    ConfigParser::registerValue<std::string>("AddressMappingScheme",
+                                             "RK:BK:CH:R:C", &addressScheme);
 
     setScheme(addressScheme, counts);
 }
 
 void setLogLevel(const NVM::Simulation::Config& conf) {
-    ConfigParser parser;
     std::string logLevel;
-    parser.registerValue<std::string>("LogLevel", "STAT", &logLevel);
-    parser.parse(conf);
+    ConfigParser::registerValue<std::string>("LogLevel", "STAT", &logLevel);
 
     if (logLevel == "DEBUG") {
         log().setGlobalLevel(LogLevel::DEBUG);
@@ -77,6 +72,7 @@ int main(int argc, char* argv[]) {
     ncycle_t simulateCycles = getMaxCycles((argc > 3) ? argv[3] : nullptr);
 
     NVM::Simulation::Config conf = readConfig(argv[1]);
+    ConfigParser::setConfig(conf);
 
     for (int i = 4; i < argc; i++) {
         conf.override(argv[i]);
@@ -88,10 +84,8 @@ int main(int argc, char* argv[]) {
     // Build RTSystem
     std::unique_ptr<MemorySystem> memory;
 
-    ConfigParser parser;
     std::string memType;
-    parser.registerValue<std::string>("MemType", "Simple", &memType);
-    parser.parse(conf);
+    ConfigParser::registerValue<std::string>("MemType", "Simple", &memType);
 
     if (memType == "Simple") {
         memory = makeSimpleSystem(conf);