pkg with 2300~2390

Signed-off-by: Ruige <[email protected]>
whutddk · Sep 25, 2022 · a659518 · a659518
1 parent acecb81
commit a659518
Show file tree

Hide file tree

Showing 7 changed files with 85 additions and 67 deletions.
diff --git a/.github/workflows/BuildAndTest.yml b/.github/workflows/BuildAndTest.yml
@@ -69,21 +69,27 @@ jobs:
           cp -R target/scala-2.12/api /Users/runner/work/Rift2Core/ScalaDoc/$GITHUB_REF_NAME
 
           cd /Users/runner/work/Rift2Core/Rift2Core/generated/Release/
-          tar -cvf Rift2430-Release.tar Rift2430/*
-          tar -cvf Rift2440-Release.tar Rift2440/*
-          tar -cvf Rift2450-Release.tar Rift2450/*
-          tar -cvf Rift2460-Release.tar Rift2460/*
-          tar -cvf Rift2470-Release.tar Rift2470/*
-          tar -cvf Rift2480-Release.tar Rift2480/*
-          tar -cvf Rift2490-Release.tar Rift2490/*
+          tar -cvf Rift2300-Release.tar Rift2300/*
+          tar -cvf Rift2310-Release.tar Rift2310/*
+          tar -cvf Rift2320-Release.tar Rift2320/*
+          tar -cvf Rift2330-Release.tar Rift2330/*
+          tar -cvf Rift2340-Release.tar Rift2340/*
+          tar -cvf Rift2350-Release.tar Rift2350/*
+          tar -cvf Rift2360-Release.tar Rift2360/*
+          tar -cvf Rift2370-Release.tar Rift2370/*
+          tar -cvf Rift2380-Release.tar Rift2380/*
+          tar -cvf Rift2390-Release.tar Rift2390/*
           cd /Users/runner/work/Rift2Core/Rift2Core/generated/Debug/
-          tar -cvf Rift2430-Debug.tar  Rift2430/*
-          tar -cvf Rift2440-Debug.tar  Rift2440/*
-          tar -cvf Rift2450-Debug.tar  Rift2450/*
-          tar -cvf Rift2460-Debug.tar  Rift2460/*
-          tar -cvf Rift2470-Debug.tar  Rift2470/*
-          tar -cvf Rift2480-Debug.tar  Rift2480/*
-          tar -cvf Rift2490-Debug.tar  Rift2490/*
+          tar -cvf Rift2300-Debug.tar  Rift2300/*
+          tar -cvf Rift2310-Debug.tar  Rift2310/*
+          tar -cvf Rift2320-Debug.tar  Rift2320/*
+          tar -cvf Rift2330-Debug.tar  Rift2330/*
+          tar -cvf Rift2340-Debug.tar  Rift2340/*
+          tar -cvf Rift2350-Debug.tar  Rift2350/*
+          tar -cvf Rift2360-Debug.tar  Rift2360/*
+          tar -cvf Rift2370-Debug.tar  Rift2370/*
+          tar -cvf Rift2380-Debug.tar  Rift2380/*
+          tar -cvf Rift2390-Debug.tar  Rift2390/*
           cd /Users/runner/work/Rift2Core/Rift2Core/
 
 
@@ -143,20 +149,26 @@ jobs:
           prerelease: true
           target_commitish: ${{github.ref_name}}
           files: |
-            ./generated/Release/Rift2430-Release.tar
-            ./generated/Debug/Rift2430-Debug.tar
-            ./generated/Release/Rift2440-Release.tar
-            ./generated/Debug/Rift2440-Debug.tar
-            ./generated/Release/Rift2450-Release.tar
-            ./generated/Debug/Rift2450-Debug.tar
-            ./generated/Release/Rift2460-Release.tar
-            ./generated/Debug/Rift2460-Debug.tar
-            ./generated/Release/Rift2470-Release.tar
-            ./generated/Debug/Rift2470-Debug.tar
-            ./generated/Release/Rift2480-Release.tar
-            ./generated/Debug/Rift2480-Debug.tar
-            ./generated/Release/Rift2490-Release.tar
-            ./generated/Debug/Rift2490-Debug.tar
+            ./generated/Release/Rift2300-Release.tar
+            ./generated/Debug/Rift2300-Debug.tar
+            ./generated/Release/Rift2310-Release.tar
+            ./generated/Debug/Rift2310-Debug.tar
+            ./generated/Release/Rift2320-Release.tar
+            ./generated/Debug/Rift2320-Debug.tar
+            ./generated/Release/Rift2330-Release.tar
+            ./generated/Debug/Rift2330-Debug.tar
+            ./generated/Release/Rift2340-Release.tar
+            ./generated/Debug/Rift2340-Debug.tar
+            ./generated/Release/Rift2350-Release.tar
+            ./generated/Debug/Rift2350-Debug.tar
+            ./generated/Release/Rift2360-Release.tar
+            ./generated/Debug/Rift2360-Debug.tar
+            ./generated/Release/Rift2370-Release.tar
+            ./generated/Debug/Rift2370-Debug.tar
+            ./generated/Release/Rift2380-Release.tar
+            ./generated/Debug/Rift2380-Debug.tar
+            ./generated/Release/Rift2390-Release.tar
+            ./generated/Debug/Rift2390-Debug.tar
             ./LICENSE.Apache
             ./LICENSE.NPL
 
@@ -171,20 +183,26 @@ jobs:
           prerelease: false
           target_commitish: ${{github.ref_name}}
           files: |
-            ./generated/Release/Rift2430-Release.tar
-            ./generated/Debug/Rift2430-Debug.tar
-            ./generated/Release/Rift2440-Release.tar
-            ./generated/Debug/Rift2440-Debug.tar
-            ./generated/Release/Rift2450-Release.tar
-            ./generated/Debug/Rift2450-Debug.tar
-            ./generated/Release/Rift2460-Release.tar
-            ./generated/Debug/Rift2460-Debug.tar
-            ./generated/Release/Rift2470-Release.tar
-            ./generated/Debug/Rift2470-Debug.tar
-            ./generated/Release/Rift2480-Release.tar
-            ./generated/Debug/Rift2480-Debug.tar
-            ./generated/Release/Rift2490-Release.tar
-            ./generated/Debug/Rift2490-Debug.tar
+            ./generated/Release/Rift2300-Release.tar
+            ./generated/Debug/Rift2300-Debug.tar
+            ./generated/Release/Rift2310-Release.tar
+            ./generated/Debug/Rift2310-Debug.tar
+            ./generated/Release/Rift2320-Release.tar
+            ./generated/Debug/Rift2320-Debug.tar
+            ./generated/Release/Rift2330-Release.tar
+            ./generated/Debug/Rift2330-Debug.tar
+            ./generated/Release/Rift2340-Release.tar
+            ./generated/Debug/Rift2340-Debug.tar
+            ./generated/Release/Rift2350-Release.tar
+            ./generated/Debug/Rift2350-Debug.tar
+            ./generated/Release/Rift2360-Release.tar
+            ./generated/Debug/Rift2360-Debug.tar
+            ./generated/Release/Rift2370-Release.tar
+            ./generated/Debug/Rift2370-Debug.tar
+            ./generated/Release/Rift2380-Release.tar
+            ./generated/Debug/Rift2380-Debug.tar
+            ./generated/Release/Rift2390-Release.tar
+            ./generated/Debug/Rift2390-Debug.tar
             ./LICENSE.Apache
             ./LICENSE.NPL
 
@@ -199,14 +217,14 @@ jobs:
       #     echo test, and deploy your project.
 
 
-  rift24x0CI:
-    name: rift24x0 CI
+  rift23x0CI:
+    name: rift23x0 CI
     needs: chiselStage
 
     strategy:
       fail-fast: false
       matrix:
-        version: [Rift2430, Rift2440, Rift2450, Rift2460, Rift2470, Rift2480, Rift2490]
+        version: [Rift2330, Rift2340, Rift2350, Rift2360, Rift2370, Rift2380, Rift2390]
     runs-on: ubuntu-latest
     container:
       image: whutddk/rift2env:riscvtest
@@ -224,7 +242,7 @@ jobs:
       - name: set up apt
         run: |
           apt-get update
-          apt-get install -y wget git make g++ ccache
+          apt-get install -y wget git make g++ ccache zlib1g zlib1g-dev
 
 
           

diff --git a/Makefile b/Makefile
@@ -244,8 +244,8 @@ fpuisa += rv64uf-v-move
 fpuisa += rv64uf-p-recoding
 fpuisa += rv64uf-v-recoding
 
-# isa ?= $(aluisa) $(bruisa) $(lsuisa) $(privisa) $(mulisa) $(fpuisa) 
-isa ?= $(fpuisa)
+isa ?= $(aluisa) $(bruisa) $(lsuisa) $(privisa) $(mulisa) # $(fpuisa) 
+# isa ?= $(fpuisa)
 
 
 
@@ -301,7 +301,7 @@ VSimTop:
 	${R2}/tb/verilator/sim_main.cpp  \
 	${R2}/tb/verilator/diff.cpp \
 	-Mdir ./generated/build/$(CONFIG) \
-	-j 30
+	-j 1
 
 
 isa: VSimTop

diff --git a/README.md b/README.md
@@ -47,16 +47,16 @@ Download Pre-compile Version [Here](https://github.com/whutddk/Rift2Core/release
 
 |Version|Test|Dhrystone|CoreMark|
 |:----: |:--:|:-------:|:------:|
-|Rift-2400|N/A|N/A|N/A|
-|Rift-2410|N/A|N/A|N/A|
-|Rift-2420|N/A|N/A|N/A|
-|Rift-2430|![](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/whutddk/Rift2Core/gh_pages/generated/Debug/Rift2430/isa.json)|![](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/whutddk/Rift2Core/gh_pages/generated/Debug/Rift2430/dhrystone.json)|![](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/whutddk/Rift2Core/gh_pages/generated/Debug/Rift2430/coremark.json)|
-|Rift-2440|![](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/whutddk/Rift2Core/gh_pages/generated/Debug/Rift2440/isa.json)|![](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/whutddk/Rift2Core/gh_pages/generated/Debug/Rift2440/dhrystone.json)|![](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/whutddk/Rift2Core/gh_pages/generated/Debug/Rift2440/coremark.json)|
-|Rift-2450|![](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/whutddk/Rift2Core/gh_pages/generated/Debug/Rift2450/isa.json)|![](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/whutddk/Rift2Core/gh_pages/generated/Debug/Rift2450/dhrystone.json)|![](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/whutddk/Rift2Core/gh_pages/generated/Debug/Rift2450/coremark.json)|
-|Rift-2460|![](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/whutddk/Rift2Core/gh_pages/generated/Debug/Rift2460/isa.json)|![](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/whutddk/Rift2Core/gh_pages/generated/Debug/Rift2460/dhrystone.json)|![](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/whutddk/Rift2Core/gh_pages/generated/Debug/Rift2460/coremark.json)|
-|Rift-2470|![](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/whutddk/Rift2Core/gh_pages/generated/Debug/Rift2470/isa.json)|![](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/whutddk/Rift2Core/gh_pages/generated/Debug/Rift2470/dhrystone.json)|![](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/whutddk/Rift2Core/gh_pages/generated/Debug/Rift2470/coremark.json)|
-|Rift-2480|![](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/whutddk/Rift2Core/gh_pages/generated/Debug/Rift2480/isa.json)|![](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/whutddk/Rift2Core/gh_pages/generated/Debug/Rift2480/dhrystone.json)|![](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/whutddk/Rift2Core/gh_pages/generated/Debug/Rift2480/coremark.json)|
-|Rift-2490|![](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/whutddk/Rift2Core/gh_pages/generated/Debug/Rift2490/isa.json)|![](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/whutddk/Rift2Core/gh_pages/generated/Debug/Rift2490/dhrystone.json)|![](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/whutddk/Rift2Core/gh_pages/generated/Debug/Rift2490/coremark.json)|
+|Rift-2300|N/A|N/A|N/A|
+|Rift-2310|N/A|N/A|N/A|
+|Rift-2320|N/A|N/A|N/A|
+|Rift-2330|![](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/whutddk/Rift2Core/gh_pages/generated/Debug/Rift2330/isa.json)|![](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/whutddk/Rift2Core/gh_pages/generated/Debug/Rift2330/dhrystone.json)|![](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/whutddk/Rift2Core/gh_pages/generated/Debug/Rift2330/coremark.json)|
+|Rift-2340|![](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/whutddk/Rift2Core/gh_pages/generated/Debug/Rift2340/isa.json)|![](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/whutddk/Rift2Core/gh_pages/generated/Debug/Rift2340/dhrystone.json)|![](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/whutddk/Rift2Core/gh_pages/generated/Debug/Rift2340/coremark.json)|
+|Rift-2350|![](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/whutddk/Rift2Core/gh_pages/generated/Debug/Rift2350/isa.json)|![](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/whutddk/Rift2Core/gh_pages/generated/Debug/Rift2350/dhrystone.json)|![](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/whutddk/Rift2Core/gh_pages/generated/Debug/Rift2350/coremark.json)|
+|Rift-2360|![](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/whutddk/Rift2Core/gh_pages/generated/Debug/Rift2360/isa.json)|![](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/whutddk/Rift2Core/gh_pages/generated/Debug/Rift2360/dhrystone.json)|![](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/whutddk/Rift2Core/gh_pages/generated/Debug/Rift2360/coremark.json)|
+|Rift-2370|![](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/whutddk/Rift2Core/gh_pages/generated/Debug/Rift2370/isa.json)|![](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/whutddk/Rift2Core/gh_pages/generated/Debug/Rift2370/dhrystone.json)|![](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/whutddk/Rift2Core/gh_pages/generated/Debug/Rift2370/coremark.json)|
+|Rift-2380|![](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/whutddk/Rift2Core/gh_pages/generated/Debug/Rift2380/isa.json)|![](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/whutddk/Rift2Core/gh_pages/generated/Debug/Rift2380/dhrystone.json)|![](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/whutddk/Rift2Core/gh_pages/generated/Debug/Rift2380/coremark.json)|
+|Rift-2390|![](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/whutddk/Rift2Core/gh_pages/generated/Debug/Rift2390/isa.json)|![](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/whutddk/Rift2Core/gh_pages/generated/Debug/Rift2390/dhrystone.json)|![](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/whutddk/Rift2Core/gh_pages/generated/Debug/Rift2390/coremark.json)|
 
 
 

diff --git a/build.sbt b/build.sbt
@@ -2,9 +2,9 @@
 
 // See README.md for license details.
 
-ThisBuild / scalaVersion     := "2.12.15"
+ThisBuild / scalaVersion     := "2.12.9"
 
-ThisBuild / version          := "2.4.0"//-SNAPSHOT
+ThisBuild / version          := "2.3.4"//-SNAPSHOT
 ThisBuild / organization     := "io.github.whutddk"
 
 

diff --git a/src/main/scala/Config.scala b/src/main/scala/Config.scala
@@ -347,7 +347,7 @@ class Rift2380 extends Config((site, here, up) => {
   case RiftParamsKey => RiftSetting(
     hasFpu = true,
     hasDebugger = true,
-    hasPreFetch = true,
+    hasPreFetch = false,
 
     opChn = 6,
     wbChn = 4,
@@ -387,7 +387,7 @@ class Rift2390 extends Config((site, here, up) => {
   case RiftParamsKey => RiftSetting(
     hasFpu = true,
     hasDebugger = true,
-    hasPreFetch = true,
+    hasPreFetch = false,
 
     opChn = 8,
     wbChn = 4,

diff --git a/src/main/scala/rift2Core/frontend/RAS.scala b/src/main/scala/rift2Core/frontend/RAS.scala
@@ -77,7 +77,7 @@ class RAS()(implicit p: Parameters) extends IFetchModule {
 
 
 
-  assert ( ~(io.enq.fire & io.deq.fire), "Assert Fail at RSA, RSA will never pop and push at the same times" )
+  // assert ( ~(io.enq.fire & io.deq.fire), "Assert Fail at RSA, RSA will never pop and push at the same times" )
 
 
 }

diff --git a/src/test/scala/rift2Core/rift2Chip_tb.scala b/src/test/scala/rift2Core/rift2Chip_tb.scala
@@ -81,9 +81,9 @@ object tapeMain extends App {
 object testAll extends App {
 
   val config = Seq(
-    // (new Rift2300, "Rift2300" ),
-    // (new Rift2310, "Rift2310" ),
-    // (new Rift2320, "Rift2320" ),
+    (new Rift2300, "Rift2300" ),
+    (new Rift2310, "Rift2310" ),
+    (new Rift2320, "Rift2320" ),
     (new Rift2330, "Rift2330" ),
     (new Rift2340, "Rift2340" ),
     (new Rift2350, "Rift2350" ),