Merge remote-tracking branch 'origin/master' into patch_sysplugs_vanilla

tum-ei-eda · Jul 4, 2024 · a398efb · a398efb
2 parents 1ec1d8a + 3f5c1d7
commit a398efb
Show file tree

Hide file tree

Showing 195 changed files with 801 additions and 13,450 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,7 +18,7 @@ jobs:
     name: ${{ matrix.config.name }}_build
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Requirements (Linux)
       if: matrix.config.name == 'Linux'
@@ -117,7 +117,7 @@ jobs:
       run: tar -C ${{runner.workspace}} -cvf ${{runner.workspace}}/etiss.tar install
 
     - name: Upload Compiled System
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: etiss-${{matrix.config.name}}.tar
         path: ${{runner.workspace}}/etiss.tar
@@ -136,7 +136,7 @@ jobs:
 
     steps:
     - name: Fetch Compiled System
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v4
       with:
         name: etiss-${{matrix.config.name}}.tar
         path: ${{runner.workspace}}
@@ -206,7 +206,7 @@ jobs:
 
     steps:
     - name: Fetch Compiled System
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v4
       with:
         name: etiss-Linux.tar
         path: ${{runner.workspace}}
@@ -230,7 +230,7 @@ jobs:
         mv ${{runner.workspace}}/results/run.json ${{runner.workspace}}/results/run_${{matrix.jit-engine}}_${{matrix.run-no}}.json
 
     - name: Save Benchmark Results
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: run_${{matrix.jit-engine}}_${{matrix.run-no}}.json
         path: ${{runner.workspace}}/results/run_${{matrix.jit-engine}}_${{matrix.run-no}}.json
@@ -240,10 +240,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Fetch results
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           path: artifacts
 
@@ -258,7 +258,7 @@ jobs:
         run: pip install -r script/requirements.txt
 
       - name: get old benchmark results
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           ref: benchmark_results
           path: benchmark_results_old
@@ -287,27 +287,27 @@ jobs:
           enable_jekyll: true
 
       - name: uploading benchmark_results
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: stats_file.json
 
           path: benchmark_results_old/stats_file.json
 
       - name: uploading image
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: performance_metrics.svg
           path: results_/performance_metrics.svg
 
       - name: Upload comment text
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: issue.md
 
           path: results_/issue.md
 
       - name: Upload wiki text
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: wiki.md
           path: results_/wiki.md
@@ -319,7 +319,7 @@ jobs:
 #
 #    steps:
 #      - name: Get comment text
-#        uses: actions/download-artifact@v2
+#        uses: actions/download-artifact@v4
 #        with:
 #          name: issue.md
 #
@@ -362,7 +362,7 @@ jobs:
 
     steps:
       - name: Get comment text
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: issue.md
 
@@ -407,12 +407,12 @@ jobs:
 
     steps:
       - name: Get comment text
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: wiki.md
 
       - name: Get performance_metrics.svg
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: performance_metrics.svg
 
@@ -438,7 +438,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Delete Artifact
         uses: geekyeggo/delete-artifact@v2

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -20,7 +20,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Requirements
       run: |
@@ -51,13 +51,13 @@ jobs:
       run: cmake --build . --config $BUILD_TYPE --target doc
 
     - name: Setup Pages
-      uses: actions/configure-pages@v1
+      uses: actions/configure-pages@v4
 
     - name: Upload artifact
-      uses: actions/upload-pages-artifact@v1
+      uses: actions/upload-pages-artifact@v3
       with:
         path: ${{runner.workspace}}/build/doc/html
 
     - name: Deploy to GitHub Pages
       id: deployment
-      uses: actions/deploy-pages@v1
+      uses: actions/deploy-pages@v4
diff --git a/ArchImpl/RV32IMACFD/CMakeLists.txt b/ArchImpl/RV32IMACFD/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Generated on Tue, 28 Nov 2023 09:45:19 +0100.
+# Generated on Wed, 08 May 2024 17:36:07 +0200.
 #
 # This file contains the CMake build info for the RV32IMACFD core architecture.
 

diff --git a/ArchImpl/RV32IMACFD/RV32IMACFD.h b/ArchImpl/RV32IMACFD/RV32IMACFD.h
@@ -1,5 +1,5 @@
 /**
- * Generated on Tue, 28 Nov 2023 09:45:19 +0100.
+ * Generated on Wed, 08 May 2024 17:36:07 +0200.
  *
  * This file contains the registers for the RV32IMACFD core architecture.
  */

diff --git a/ArchImpl/RV32IMACFD/RV32IMACFDArch.cpp b/ArchImpl/RV32IMACFD/RV32IMACFDArch.cpp
@@ -1,5 +1,5 @@
 /**
- * Generated on Tue, 28 Nov 2023 09:45:19 +0100.
+ * Generated on Wed, 08 May 2024 17:36:07 +0200.
  *
  * This file contains the architecture class for the RV32IMACFD core architecture.
  */
@@ -41,7 +41,7 @@
 using namespace etiss ;
 using namespace etiss::instr ;
 
-RV32IMACFDArch::RV32IMACFDArch():CPUArch("RV32IMACFD")
+RV32IMACFDArch::RV32IMACFDArch(unsigned int coreno):CPUArch("RV32IMACFD"), coreno_(coreno)
 {
 	headers_.insert("Arch/RV32IMACFD/RV32IMACFD.h");
 }
@@ -166,17 +166,18 @@ void RV32IMACFDArch::resetCPU(ETISS_CPU * cpu,etiss::uint64 * startpointer)
  	rv32imacfdcpu->CSR[772] = &rv32imacfdcpu->MIE;
  	rv32imacfdcpu->CSR[836] = &rv32imacfdcpu->MIP;
 
- 	rv32imacfdcpu->PRIV = 3;
- 	rv32imacfdcpu->DPC = 0;
- 	*rv32imacfdcpu->CSR[0] = 11;
-	*rv32imacfdcpu->CSR[256] = 11;
-	*rv32imacfdcpu->CSR[768] = 11;
-	*rv32imacfdcpu->CSR[769] = 1075056941;
-	*rv32imacfdcpu->CSR[3088] = 3;
-	*rv32imacfdcpu->CSR[772] = 4294966203;
-	*rv32imacfdcpu->CSR[260] = 4294964019;
-	*rv32imacfdcpu->CSR[4] = 4294963473;
- 	rv32imacfdcpu->RES_ADDR = -1;
+   	rv32imacfdcpu->PRIV = 3ULL;
+   	rv32imacfdcpu->DPC = 0LL;
+  	*rv32imacfdcpu->CSR[0] = 11ULL;
+ 	*rv32imacfdcpu->CSR[256] = 11ULL;
+ 	*rv32imacfdcpu->CSR[768] = 11ULL;
+ 	*rv32imacfdcpu->CSR[769] = 1075056941ULL;
+ 	*rv32imacfdcpu->CSR[3088] = 3ULL;
+ 	*rv32imacfdcpu->CSR[772] = 4294966203ULL;
+ 	*rv32imacfdcpu->CSR[260] = 4294964019ULL;
+ 	*rv32imacfdcpu->CSR[4] = 4294963473ULL;
+   	rv32imacfdcpu->RES_ADDR = -1LL;
+
 }
 
 void RV32IMACFDArch::deleteCPU(ETISS_CPU *cpu)

diff --git a/ArchImpl/RV32IMACFD/RV32IMACFDArch.h b/ArchImpl/RV32IMACFD/RV32IMACFDArch.h
@@ -1,5 +1,5 @@
 /**
- * Generated on Tue, 28 Nov 2023 09:45:19 +0100.
+ * Generated on Wed, 08 May 2024 17:36:07 +0200.
  *
  * This file contains the architecture class for the RV32IMACFD core architecture.
  */
@@ -28,7 +28,7 @@ extern etiss::instr::InstructionCollection RV32IMACFDISA;
 class RV32IMACFDArch : public etiss::CPUArch {
 
 public:
-	RV32IMACFDArch();
+	RV32IMACFDArch(unsigned int);
 
 	virtual const std::set<std::string> & getListenerSupportedRegisters();
 
@@ -104,5 +104,6 @@ class RV32IMACFDArch : public etiss::CPUArch {
 	std::set<std::string> listenerSupportedRegisters_;
 	std::set<std::string> headers_;
 	RV32IMACFDGDBCore gdbcore_;
+	unsigned int coreno_;
 };
 #endif
diff --git a/ArchImpl/RV32IMACFD/RV32IMACFDArchLib.cpp b/ArchImpl/RV32IMACFD/RV32IMACFDArchLib.cpp
@@ -1,5 +1,5 @@
 /**
- * Generated on Tue, 28 Nov 2023 09:45:19 +0100.
+ * Generated on Wed, 08 May 2024 17:36:07 +0200.
  *
  * This file contains the library interface for the RV32IMACFD core architecture.
  */
@@ -10,6 +10,7 @@
 #define ETISS_LIBNAME RV32IMACFD
 #include "etiss/helper/CPUArchLibrary.h" // defines the following functions
 #include "RV32IMACFDArch.h"
+#include <string>
 extern "C" {
 
 	ETISS_LIBRARYIF_VERSION_FUNC_IMPL
@@ -36,7 +37,16 @@ extern "C" {
 		switch (index)
 		{
 		case 0:
-			return new RV32IMACFDArch();
+			{
+				auto it = options.find("coreno");
+				unsigned int coreno = 0;
+				if (it != options.end())
+					coreno = std::stoul(it->second);
+				else
+					etiss::log(etiss::WARNING, "no core number provided for core, using 0");
+
+				return new RV32IMACFDArch(coreno);
+			}
 		default:
 			return 0;
 		}

diff --git a/ArchImpl/RV32IMACFD/RV32IMACFDArchSpecificImp.h b/ArchImpl/RV32IMACFD/RV32IMACFDArchSpecificImp.h
@@ -1,5 +1,5 @@
 /**
- * Generated on Tue, 28 Nov 2023 09:45:19 +0100.
+ * Generated on Wed, 08 May 2024 17:36:07 +0200.
  *
  * This file contains the architecture specific header for the RV32IMACFD
  * core architecture.