[snippy] removed setting pc before register dump after execution of s…

…nippet
syntacore · Apr 25, 2024 · a2b5932 · a2b5932
1 parent 8638f23
commit a2b5932
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/llvm/tools/llvm-snippy/include/snippy/Generator/SimRunner.h b/llvm/tools/llvm-snippy/include/snippy/Generator/SimRunner.h
@@ -37,10 +37,9 @@ class SimRunner {
     return *CoInterp.front();
   }
 
-  // Preform co-simulation run and returns PC before final instruction.
+  // Preform co-simulation run.
   // Each interpreter state will be reset before run.
-  ProgramCounterType run(StringRef Programm,
-                         const IRegisterState &InitialRegState);
+  void run(StringRef Programm, const IRegisterState &InitialRegState);
 
   // Adds output section name to the sim config
   //  in order to load it later to the model before execution.

diff --git a/llvm/tools/llvm-snippy/lib/Generator/GeneratorContext.cpp b/llvm/tools/llvm-snippy/lib/Generator/GeneratorContext.cpp
@@ -298,9 +298,8 @@ void GeneratorContext::runSimulator(StringRef ImageToRun) {
 
     auto &SimRunner = getOrCreateSimRunner();
 
-    auto FinalPC = SimRunner.run(ImageToRun, InitRegState);
+    SimRunner.run(ImageToRun, InitRegState);
 
-    I.setPC(FinalPC);
     I.dumpCurrentRegState(GenSettings->RegistersConfig.FinalStateOutputYaml);
     auto RangesToDump = getMemoryRangesToDump(I, DumpMemorySection);
     if (!RangesToDump.empty())

diff --git a/llvm/tools/llvm-snippy/lib/Generator/SimRunner.cpp b/llvm/tools/llvm-snippy/lib/Generator/SimRunner.cpp
@@ -61,8 +61,7 @@ SimRunner::SimRunner(LLVMContext &Ctx, const SnippyTarget &TGT,
   }
 }
 
-ProgramCounterType SimRunner::run(StringRef Program,
-                                  const IRegisterState &InitialRegState) {
+void SimRunner::run(StringRef Program, const IRegisterState &InitialRegState) {
   auto StopPC = getAddressOfSymbolInImage(Program, Linker::GetExitSymbolName());
   if (auto E = StopPC.takeError()) {
     auto Err = toString(std::move(E));
@@ -81,10 +80,7 @@ ProgramCounterType SimRunner::run(StringRef Program,
   auto &PrimI = getPrimaryInterpreter();
   PrimI.logMessage("#===Simulation Start===\n");
 
-  ProgramCounterType CurPC = PrimI.getPC();
-
   while (!PrimI.endOfProg()) {
-    CurPC = PrimI.getPC();
     auto ExecRes = PrimI.step();
     if (ExecRes == ExecutionResult::FatalError)
       PrimI.reportSimulationFatalError("Primary interpreter step failed");
@@ -106,7 +102,6 @@ ProgramCounterType SimRunner::run(StringRef Program,
     checkStates(/* CheckMemory */ false);
   }
   checkStates(/* CheckMemory */ true);
-  return CurPC;
 }
 
 void SimRunner::checkStates(bool CheckMemory) {