Merge pull request #302 from leekillough/misc_fixes

leekillough · web-flow · commit 1c9f3554b058 · 2024-07-11T15:03:11.000-05:00
Misc fixes
diff --git a/include/RevCPU.h b/include/RevCPU.h
@@ -48,7 +48,7 @@ class RevCPU : public SST::Component {
   RevCPU( SST::ComponentId_t id, const SST::Params& params );
 
   /// RevCPU: top-level SST component destructor
-  ~RevCPU();
+  ~RevCPU()                          = default;
 
   /// RevCPU: disallow copying and assignment
   RevCPU( const RevCPU& )            = delete;
@@ -212,17 +212,17 @@ class RevCPU : public SST::Component {
   }
 
 private:
-  unsigned numCores{};     ///< RevCPU: number of RISC-V cores
-  unsigned numHarts{};     ///< RevCPU: number of RISC-V cores
+  uint32_t numCores{};     ///< RevCPU: number of RISC-V cores
+  uint32_t numHarts{};     ///< RevCPU: number of RISC-V cores
   unsigned msgPerCycle{};  ///< RevCPU: number of messages to send per cycle
   //  unsigned          RDMAPerCycle{};  ///< RevCPU: number of RDMA messages per cycle to inject into PAN network
   //  unsigned          testStage{};     ///< RevCPU: controls the PAN Test harness staging
   //  unsigned          testIters{};     ///< RevCPU: the number of message iters for each PAN Test
-  RevOpts*              Opts{};     ///< RevCPU: Simulation options object
-  RevMem*               Mem{};      ///< RevCPU: RISC-V main memory object
-  RevLoader*            Loader{};   ///< RevCPU: RISC-V loader
-  std::vector<RevCore*> Procs{};    ///< RevCPU: RISC-V processor objects
-  bool*                 Enabled{};  ///< RevCPU: Completion structure
+  std::unique_ptr<RevOpts>              Opts;     ///< RevCPU: Simulation options object
+  std::unique_ptr<RevMem>               Mem;      ///< RevCPU: RISC-V main memory object
+  std::unique_ptr<RevLoader>            Loader;   ///< RevCPU: RISC-V loader
+  std::vector<std::unique_ptr<RevCore>> Procs;    ///< RevCPU: RISC-V processor objects
+  std::vector<bool>                     Enabled;  ///< RevCPU: Completion structure
 
   // Initializes a RevThread object.
   // - Adds it's ThreadID to the ThreadQueue to be scheduled
@@ -266,7 +266,7 @@ class RevCPU : public SST::Component {
   uint8_t PrivTag{};  ///< RevCPU: private tag locator
   //  uint32_t LToken{};   ///< RevCPU: token identifier for PAN Test
 
-  int address{};  ///< RevCPU: local network address
+  int address{ -1 };  ///< RevCPU: local network address
 
   unsigned fault_width{};  ///< RevCPU: the width (in bits) for target faults
   // int64_t  fault_range{};  ///< RevCPU: the range of cycles to inject the fault
@@ -289,10 +289,10 @@ class RevCPU : public SST::Component {
   TimeConverter* timeConverter{};  ///< RevCPU: SST time conversion handler
   SST::Output    output{};         ///< RevCPU: SST output handler
 
-  nicAPI*     Nic{};   ///< RevCPU: Network interface controller
-  RevMemCtrl* Ctrl{};  ///< RevCPU: Rev memory controller
+  nicAPI*                     Nic{};  ///< RevCPU: Network interface controller
+  std::unique_ptr<RevMemCtrl> Ctrl;   ///< RevCPU: Rev memory controller
 
-  std::vector<RevCoProc*> CoProcs{};  ///< RevCPU: CoProcessor attached to Rev
+  std::vector<std::unique_ptr<RevCoProc>> CoProcs;  ///< RevCPU: CoProcessor attached to Rev
 
   SST::Clock::Handler<RevCPU>* ClockHandler{};  ///< RevCPU: Clock Handler
 
diff --git a/include/RevMem.h b/include/RevMem.h
@@ -55,7 +55,7 @@ class RevMem {
   RevMem( uint64_t MemSize, RevOpts* Opts, SST::Output* Output );
 
   /// RevMem: standard memory controller constructor
-  RevMem( uint64_t MemSize, RevOpts* Opts, RevMemCtrl* Ctrl, SST::Output* Output );
+  RevMem( uint64_t memSize, RevOpts* opts, RevMemCtrl* ctrl, SST::Output* output );
 
   /// RevMem: standard destructor
   ~RevMem() { delete[] physMem; }
diff --git a/include/insns/CMakeLists.txt b/include/insns/CMakeLists.txt
diff --git a/scripts/slurm/build-gcc11-sst13.1.0.sh b/scripts/slurm/build-gcc11-sst13.1.0.sh
@@ -35,7 +35,7 @@ cd build
 rm -Rf ./*
 
 #-- Stage 3: initiate the build
-cmake -DCMAKE_BUILD_TYPE=Debug -DRVCC=${RVCC} ../ >> ../rev.jenkins.${SLURM_JOB_ID}.out 2>&1
+cmake -DBUILD_ASM_TESTING=ON -DCMAKE_BUILD_TYPE=Debug -DRVCC=${RVCC} ../ >> ../rev.jenkins.${SLURM_JOB_ID}.out 2>&1
 make clean >> ../rev.jenkins.${SLURM_JOB_ID}.out 2>&1
 make uninstall >> ../rev.jenkins.${SLURM_JOB_ID}.out 2>&1
 make -j >> ../rev.jenkins.${SLURM_JOB_ID}.out 2>&1
diff --git a/scripts/slurm/build-gcc11-sst14.0.0.sh b/scripts/slurm/build-gcc11-sst14.0.0.sh
@@ -35,7 +35,7 @@ cd build
 rm -Rf ./*
 
 #-- Stage 3: initiate the build
-cmake -DCMAKE_BUILD_TYPE=Debug -DRVCC=${RVCC} ../ >> ../rev.jenkins.${SLURM_JOB_ID}.out 2>&1
+cmake -DBUILD_ASM_TESTING=ON -DCMAKE_BUILD_TYPE=Debug -DRVCC=${RVCC} ../ >> ../rev.jenkins.${SLURM_JOB_ID}.out 2>&1
 make clean >> ../rev.jenkins.${SLURM_JOB_ID}.out 2>&1
 make uninstall >> ../rev.jenkins.${SLURM_JOB_ID}.out 2>&1
 make -j >> ../rev.jenkins.${SLURM_JOB_ID}.out 2>&1
diff --git a/scripts/slurm/build-gcc11.sh b/scripts/slurm/build-gcc11.sh
@@ -35,7 +35,7 @@ cd build
 rm -Rf ./*
 
 #-- Stage 3: initiate the build
-cmake -DCMAKE_BUILD_TYPE=Debug -DRVCC=${RVCC} ../ >> ../rev.jenkins.${SLURM_JOB_ID}.out 2>&1
+cmake -DBUILD_ASM_TESTING=ON -DCMAKE_BUILD_TYPE=Debug -DRVCC=${RVCC} ../ >> ../rev.jenkins.${SLURM_JOB_ID}.out 2>&1
 make clean >> ../rev.jenkins.${SLURM_JOB_ID}.out 2>&1
 make uninstall >> ../rev.jenkins.${SLURM_JOB_ID}.out 2>&1
 make -j >> ../rev.jenkins.${SLURM_JOB_ID}.out 2>&1
diff --git a/scripts/slurm/build-gcc13-sst13.1.0.sh b/scripts/slurm/build-gcc13-sst13.1.0.sh
@@ -35,7 +35,7 @@ cd build
 rm -Rf ./*
 
 #-- Stage 3: initiate the build
-cmake -DCMAKE_BUILD_TYPE=Debug -DRVCC=${RVCC} ../ >> ../rev.jenkins.${SLURM_JOB_ID}.out 2>&1
+cmake -DBUILD_ASM_TESTING=ON -DCMAKE_BUILD_TYPE=Debug -DRVCC=${RVCC} ../ >> ../rev.jenkins.${SLURM_JOB_ID}.out 2>&1
 make clean >> ../rev.jenkins.${SLURM_JOB_ID}.out 2>&1
 make uninstall >> ../rev.jenkins.${SLURM_JOB_ID}.out 2>&1
 make -j >> ../rev.jenkins.${SLURM_JOB_ID}.out 2>&1
diff --git a/scripts/slurm/build-gcc13-sst14.0.0.sh b/scripts/slurm/build-gcc13-sst14.0.0.sh
@@ -35,7 +35,7 @@ cd build
 rm -Rf ./*
 
 #-- Stage 3: initiate the build
-cmake -DCMAKE_BUILD_TYPE=Debug -DRVCC=${RVCC} ../ >> ../rev.jenkins.${SLURM_JOB_ID}.out 2>&1
+cmake -DBUILD_ASM_TESTING=ON -DCMAKE_BUILD_TYPE=Debug -DRVCC=${RVCC} ../ >> ../rev.jenkins.${SLURM_JOB_ID}.out 2>&1
 make clean >> ../rev.jenkins.${SLURM_JOB_ID}.out 2>&1
 make uninstall >> ../rev.jenkins.${SLURM_JOB_ID}.out 2>&1
 make -j >> ../rev.jenkins.${SLURM_JOB_ID}.out 2>&1
diff --git a/scripts/slurm/build-gcc13.sh b/scripts/slurm/build-gcc13.sh
@@ -35,7 +35,7 @@ cd build
 rm -Rf ./*
 
 #-- Stage 3: initiate the build
-cmake -DCMAKE_BUILD_TYPE=Debug -DRVCC=${RVCC} ../ >> ../rev.jenkins.${SLURM_JOB_ID}.out 2>&1
+cmake -DBUILD_ASM_TESTING=ON -DCMAKE_BUILD_TYPE=Debug -DRVCC=${RVCC} ../ >> ../rev.jenkins.${SLURM_JOB_ID}.out 2>&1
 make clean >> ../rev.jenkins.${SLURM_JOB_ID}.out 2>&1
 make uninstall >> ../rev.jenkins.${SLURM_JOB_ID}.out 2>&1
 make -j >> ../rev.jenkins.${SLURM_JOB_ID}.out 2>&1
diff --git a/scripts/slurm/build-llvm12-sst13.1.0.sh b/scripts/slurm/build-llvm12-sst13.1.0.sh
@@ -35,7 +35,7 @@ cd build
 rm -Rf ./*
 
 #-- Stage 3: initiate the build
-cmake -DCMAKE_BUILD_TYPE=Debug -DRVCC=${RVCC} ../ >> ../rev.jenkins.${SLURM_JOB_ID}.out 2>&1
+cmake -DBUILD_ASM_TESTING=ON -DCMAKE_BUILD_TYPE=Debug -DRVCC=${RVCC} ../ >> ../rev.jenkins.${SLURM_JOB_ID}.out 2>&1
 make clean >> ../rev.jenkins.${SLURM_JOB_ID}.out 2>&1
 make uninstall >> ../rev.jenkins.${SLURM_JOB_ID}.out 2>&1
 make -j >> ../rev.jenkins.${SLURM_JOB_ID}.out 2>&1
diff --git a/scripts/slurm/build-llvm12-sst14.0.0.sh b/scripts/slurm/build-llvm12-sst14.0.0.sh
@@ -35,7 +35,7 @@ cd build
 rm -Rf ./*
 
 #-- Stage 3: initiate the build
-cmake -DCMAKE_BUILD_TYPE=Debug -DRVCC=${RVCC} ../ >> ../rev.jenkins.${SLURM_JOB_ID}.out 2>&1
+cmake -DBUILD_ASM_TESTING=ON -DCMAKE_BUILD_TYPE=Debug -DRVCC=${RVCC} ../ >> ../rev.jenkins.${SLURM_JOB_ID}.out 2>&1
 make clean >> ../rev.jenkins.${SLURM_JOB_ID}.out 2>&1
 make uninstall >> ../rev.jenkins.${SLURM_JOB_ID}.out 2>&1
 make -j >> ../rev.jenkins.${SLURM_JOB_ID}.out 2>&1
diff --git a/scripts/slurm/build-llvm12.sh b/scripts/slurm/build-llvm12.sh
@@ -35,7 +35,7 @@ cd build
 rm -Rf ./*
 
 #-- Stage 3: initiate the build
-cmake -DCMAKE_BUILD_TYPE=Debug -DRVCC=${RVCC} ../ >> ../rev.jenkins.${SLURM_JOB_ID}.out 2>&1
+cmake -DBUILD_ASM_TESTING=ON -DCMAKE_BUILD_TYPE=Debug -DRVCC=${RVCC} ../ >> ../rev.jenkins.${SLURM_JOB_ID}.out 2>&1
 make clean >> ../rev.jenkins.${SLURM_JOB_ID}.out 2>&1
 make uninstall >> ../rev.jenkins.${SLURM_JOB_ID}.out 2>&1
 make -j >> ../rev.jenkins.${SLURM_JOB_ID}.out 2>&1
diff --git a/src/RevCPU.cc b/src/RevCPU.cc
@@ -19,22 +19,18 @@ namespace SST::RevCPU {
 
 using MemSegment        = RevMem::MemSegment;
 
-const char splash_msg[] = "\
-\n\
-*******                   \n\
-/**////**                  \n\
-/**   /**   *****  **    **\n\
-/*******   **///**/**   /**\n\
-/**///**  /*******//** /** \n\
-/**  //** /**////  //****  \n\
-/**   //**//******  //**   \n\
-//     //  //////    //    \n\
-\n\
-";
-
-RevCPU::RevCPU( SST::ComponentId_t id, const SST::Params& params )
-  : SST::Component( id ), PrivTag( 0 ), address( -1 ), EnableMemH( false ), DisableCoprocClock( false ), Nic( nullptr ),
-    Ctrl( nullptr ), ClockHandler( nullptr ) {
+const char splash_msg[] = R"(
+*******
+/**////**
+/**   /**   *****  **    **
+/*******   **///**/**   /**
+/**///**  /*******//** /**
+/**  //** /**////  //****
+/**   //**//******  //**
+//     //  //////    //
+)";
+
+RevCPU::RevCPU( SST::ComponentId_t id, const SST::Params& params ) : SST::Component( id ) {
 
   const int Verbosity = params.find<int>( "verbose", 0 );
 
@@ -52,12 +48,12 @@ RevCPU::RevCPU( SST::ComponentId_t id, const SST::Params& params )
 
   // Derive the simulation parameters
   // We must always derive the number of cores before initializing the options
-  numCores = params.find<unsigned>( "numCores", "1" );
-  numHarts = params.find<uint16_t>( "numHarts", "1" );
+  numCores = params.find<uint32_t>( "numCores", "1" );
+  numHarts = params.find<uint32_t>( "numHarts", "1" );
 
-  // Make sure someone isn't trying to have more than 65536 harts per core
+  // Make sure someone isn't trying to have more than _MAX_HARTS_ harts per core
   if( numHarts > _MAX_HARTS_ ) {
-    output.fatal( CALL_INFO, -1, "Error: number of harts must be <= %" PRIu32 "\n", _MAX_HARTS_ );
+    output.fatal( CALL_INFO, -1, "Error: number of harts must be <= %" PRIu32 "\n", uint32_t{ _MAX_HARTS_ } );
   }
   output.verbose(
     CALL_INFO, 1, 0, "Building Rev with %" PRIu32 " cores and %" PRIu32 " hart(s) on each core \n", numCores, numHarts
@@ -67,9 +63,7 @@ RevCPU::RevCPU( SST::ComponentId_t id, const SST::Params& params )
   auto Exe = params.find<std::string>( "program", "a.out" );
 
   // Create the options object
-  Opts     = new( std::nothrow ) RevOpts( numCores, numHarts, Verbosity );
-  if( !Opts )
-    output.fatal( CALL_INFO, -1, "Error: failed to initialize the RevOpts object\n" );
+  Opts     = std::make_unique<RevOpts>( numCores, numHarts, Verbosity );
 
   // Program arguments
   Opts->SetArgs( params );
@@ -85,7 +79,7 @@ RevCPU::RevCPU( SST::ComponentId_t id, const SST::Params& params )
        } ) {
     std::vector<std::string> optList;
     params.find_array( ParamName, optList );
-    if( !( Opts->*InitFunc )( optList ) )
+    if( !( Opts.get()->*InitFunc )( optList ) )
       output.fatal( CALL_INFO, -1, "Error: failed to initialize %s\n", ParamName );
   }
 
@@ -125,28 +119,15 @@ RevCPU::RevCPU( SST::ComponentId_t id, const SST::Params& params )
   const uint64_t memSize = params.find<unsigned long>( "memSize", 1073741824 );
   EnableMemH             = params.find<bool>( "enable_memH", 0 );
   if( !EnableMemH ) {
-    // TODO: Use std::nothrow to return null instead of throwing std::bad_alloc
-    Mem = new RevMem( memSize, Opts, &output );
-    if( !Mem )
-      output.fatal( CALL_INFO, -1, "Error: failed to initialize the memory object\n" );
+    Mem = std::make_unique<RevMem>( memSize, Opts.get(), &output );
   } else {
-    Ctrl = loadUserSubComponent<RevMemCtrl>( "memory" );
+    Ctrl = std::unique_ptr<RevMemCtrl>( loadUserSubComponent<RevMemCtrl>( "memory" ) );
     if( !Ctrl )
       output.fatal( CALL_INFO, -1, "Error : failed to inintialize the memory controller subcomponent\n" );
-
-    // TODO: Use std::nothrow to return null instead of throwing std::bad_alloc
-    Mem = new RevMem( memSize, Opts, Ctrl, &output );
-    if( !Mem )
-      output.fatal( CALL_INFO, -1, "Error : failed to initialize the memory object\n" );
+    Mem = std::make_unique<RevMem>( memSize, Opts.get(), Ctrl.get(), &output );
 
     if( EnableFaults )
-      output.verbose(
-        CALL_INFO,
-        1,
-        0,
-        "Warning: memory faults cannot be enabled with "
-        "memHierarchy support\n"
-      );
+      output.verbose( CALL_INFO, 1, 0, "Warning: memory faults cannot be enabled with memHierarchy support\n" );
   }
 
   // Set TLB Size
@@ -158,27 +139,24 @@ RevCPU::RevCPU( SST::ComponentId_t id, const SST::Params& params )
   Mem->SetMaxHeapSize( maxHeapSize );
 
   // Load the binary into memory
-  Loader = new( std::nothrow ) RevLoader( Exe, Opts->GetArgv(), Mem, &output );
-  if( !Loader ) {
-    output.fatal( CALL_INFO, -1, "Error: failed to initialize the RISC-V loader\n" );
-  }
+  Loader = std::make_unique<RevLoader>( Exe, Opts->GetArgv(), Mem.get(), &output );
 
   // Create the processor objects
   Procs.reserve( Procs.size() + numCores );
   for( unsigned i = 0; i < numCores; i++ ) {
-    Procs.push_back( new RevCore( i, Opts, numHarts, Mem, Loader, this->GetNewTID(), &output ) );
+    Procs.push_back( std::make_unique<RevCore>( i, Opts.get(), numHarts, Mem.get(), Loader.get(), this->GetNewTID(), &output ) );
   }
 
   EnableCoProc = params.find<bool>( "enableCoProc", 0 );
   if( EnableCoProc ) {
     // Create the co-processor objects
     for( unsigned i = 0; i < numCores; i++ ) {
-      RevCoProc* CoProc = loadUserSubComponent<RevCoProc>( "co_proc", SST::ComponentInfo::SHARE_NONE, Procs[i] );
+      RevCoProc* CoProc = loadUserSubComponent<RevCoProc>( "co_proc", SST::ComponentInfo::SHARE_NONE, Procs[i].get() );
       if( !CoProc ) {
         output.fatal( CALL_INFO, -1, "Error : failed to inintialize the co-processor subcomponent\n" );
       }
-      CoProcs.push_back( CoProc );
       Procs[i]->SetCoProc( CoProc );
+      CoProcs.push_back( std::unique_ptr<RevCoProc>( CoProc ) );
     }
   }
 
@@ -335,7 +313,7 @@ RevCPU::RevCPU( SST::ComponentId_t id, const SST::Params& params )
   DisableCoprocClock    = params.find<bool>( "independentCoprocClock", 0 );
 
   // Create the completion array
-  Enabled               = new bool[numCores]{ false };
+  Enabled               = std::vector<bool>( numCores );
 
   const unsigned Splash = params.find<bool>( "splash", 0 );
 
@@ -352,32 +330,6 @@ RevCPU::RevCPU( SST::ComponentId_t id, const SST::Params& params )
   }
 }
 
-RevCPU::~RevCPU() {
-  // delete the competion array
-  delete[] Enabled;
-
-  // delete the processors objects
-  for( size_t i = 0; i < Procs.size(); i++ ) {
-    delete Procs[i];
-  }
-
-  for( size_t i = 0; i < CoProcs.size(); i++ ) {
-    delete CoProcs[i];
-  }
-
-  // delete the memory controller if present
-  delete Ctrl;
-
-  // delete the memory object
-  delete Mem;
-
-  // delete the loader object
-  delete Loader;
-
-  // delete the options object
-  delete Opts;
-}
-
 void RevCPU::DecodeFaultWidth( const std::string& width ) {
   fault_width = 1;  // default to single bit failures
 
@@ -850,7 +802,7 @@ void RevCPU::HandleThreadStateChangesForProc( uint32_t ProcID ) {
 }
 
 void RevCPU::InitMainThread( uint32_t MainThreadID, const uint64_t StartAddr ) {
-  auto MainThreadRegState = std::make_unique<RevRegFile>( Procs[0] );
+  auto MainThreadRegState = std::make_unique<RevRegFile>( Procs[0].get() );
 
   // The Program Counter gets set to the start address
   MainThreadRegState->SetPC( StartAddr );
diff --git a/src/RevFeature.cc b/src/RevFeature.cc
@@ -81,6 +81,9 @@ bool RevFeature::ParseMachineModel() {
   // -- step 2: parse all the features
   // Note: Extension strings, if present, must appear in the order listed in the table above.
   if( *mac ) {
+    char unsupported_version[128];
+    *unsupported_version = 0;
+
     for( auto [ext, majorVersion, minorVersion, minimumVersion, maximumVersion, flags] : table ) {
       // Look for an architecture string matching the current extension
       if( !strncasecmp( mac, ext.data(), ext.size() ) ) {
@@ -98,10 +101,12 @@ bool RevFeature::ParseMachineModel() {
             minorVersion = strtoul( mac, const_cast<char**>( &mac ), 10 );
         }
 
-        if( majorVersion < minimumVersion || majorVersion > maximumVersion ) {
-          output->fatal(
-            CALL_INFO,
-            -1,
+        // Record first unsupported extension version
+        // Error is delayed so that parse errors in the architecture string take priority
+        if( ( majorVersion < minimumVersion || majorVersion > maximumVersion ) && !*unsupported_version ) {
+          snprintf(
+            unsupported_version,
+            sizeof( unsupported_version ),
             "Error: Version %" PRIu32 ".%" PRIu32 " of %s extension is not supported\n",
             majorVersion,
             minorVersion,
@@ -114,8 +119,13 @@ bool RevFeature::ParseMachineModel() {
           ++mac;
 
         // Success if end of string is reached
-        if( !*mac )
+        if( !*mac ) {
+          // Report error on first unsupported extension version
+          if( *unsupported_version ) {
+            output->fatal( CALL_INFO, -1, "%s", unsupported_version );
+          }
           return true;
+        }
       }
     }
   }
diff --git a/src/RevMem.cc b/src/RevMem.cc
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
diff --git a/test/fenv/fenv_gentests.cc b/test/fenv/fenv_gentests.cc
diff --git a/test/fenv/fenv_test.h b/test/fenv/fenv_test.h
diff --git a/test/isa/CMakeLists.txt b/test/isa/CMakeLists.txt
