Clean-up naming to distinguish OP from GP Ariane (openhwgroup#193)

* Clean-up naming to distinguish  OP from GP Ariane

* Rename wb to wt in hidden CI files

* Fix verilator install script

.gitlab-ci.yml

@@ -29,7 +29,7 @@ variables:
 stages:
   - build
   - standard
-  - serpent
+  - wb
 
 ###################################
 # prepare
@@ -52,82 +52,82 @@ build:
 asm-quest:
   stage: standard
   script:
-    - make -j${NUM_JOBS} run-asm-tests batch-mode=1
+    - make -j${NUM_JOBS} run-asm-tests batch-mode=1 defines=WB_DCACHE
   dependencies:
     - build
 
 amo-quest:
   stage: standard
   script:
-    - make -j${NUM_JOBS} run-amo-tests batch-mode=1
+    - make -j${NUM_JOBS} run-amo-tests batch-mode=1 defines=WB_DCACHE
   dependencies:
     - build
 
 fp-quest:
   stage: standard
   script:
-    - make -j${NUM_JOBS} run-fp-tests batch-mode=1
+    - make -j${NUM_JOBS} run-fp-tests batch-mode=1 defines=WB_DCACHE
   dependencies:
     - build
 
 bench-quest:
   stage: standard
   script:
-    - make -j${NUM_JOBS} run-benchmarks batch-mode=1
+    - make -j${NUM_JOBS} run-benchmarks batch-mode=1 defines=WB_DCACHE
   dependencies:
     - build
 
 # rv64ui-p-* tests
 asm1-ver:
   stage: standard
   script:
-    - make -j${NUM_JOBS} run-asm-tests1-verilator
+    - make -j${NUM_JOBS} run-asm-tests1-verilator defines=WB_DCACHE
   dependencies:
     - build
 
 # rv64ui-v-* tests
 asm2-ver:
   stage: standard
   script:
-    - make -j${NUM_JOBS} run-asm-tests2-verilator
+    - make -j${NUM_JOBS} run-asm-tests2-verilator defines=WB_DCACHE
   dependencies:
     - build
 
 # rv64um-*-* tests
 mul-ver:
   stage: standard
   script:
-    - make -j${NUM_JOBS} run-mul-verilator
+    - make -j${NUM_JOBS} run-mul-verilator defines=WB_DCACHE
   dependencies:
     - build
 
 # atomics
 amo-ver:
   stage: standard
   script:
-    - make -j${NUM_JOBS} run-amo-verilator
+    - make -j${NUM_JOBS} run-amo-verilator defines=WB_DCACHE
   dependencies:
     - build
 
 # floating point
 fp-ver:
   stage: standard
   script:
-    - make -j${NUM_JOBS} run-fp-verilator 
+    - make -j${NUM_JOBS} run-fp-verilator defines=WB_DCACHE
   dependencies:
     - build
 
 bench-ver:
   stage: standard
   script:
-    - make -j${NUM_JOBS} run-benchmarks-verilator
+    - make -j${NUM_JOBS} run-benchmarks-verilator defines=WB_DCACHE
   dependencies:
     - build
 
 bench-ver:
   stage: standard
   script:
-    - make -j${NUM_JOBS} run-benchmarks-verilator
+    - make -j${NUM_JOBS} run-benchmarks-verilator defines=WT_DCACHE
   dependencies:
     - build
 
@@ -149,96 +149,96 @@ serdiv-quest:
     - build
 
 ###################################
-# tests with serpent cache system
+# tests with write-through cache system
 
 s-asm-quest:
-  stage: serpent
+  stage: write-through
   script:
-    - make -j${NUM_JOBS} run-asm-tests defines=PITON_ARIANE+AXI64_CACHE_PORTS batch-mode=1
+    - make -j${NUM_JOBS} run-asm-tests defines=WT_DCACHE batch-mode=1
   dependencies:
     - build
 
 # atomics
 s-amo-quest:
-  stage: serpent
+  stage: write-through
   script:
-    - make -j${NUM_JOBS} run-amo-tests defines=PITON_ARIANE+AXI64_CACHE_PORTS batch-mode=1
+    - make -j${NUM_JOBS} run-amo-tests defines=WT_DCACHE batch-mode=1
   dependencies:
     - build
 
-# floating point    
+# floating point
 s-fp-quest:
-  stage: serpent
+  stage: write-through
   script:
-    - make -j${NUM_JOBS} run-fp-tests defines=PITON_ARIANE+AXI64_CACHE_PORTS batch-mode=1
+    - make -j${NUM_JOBS} run-fp-tests defines=WT_DCACHE batch-mode=1
   dependencies:
     - build
 
 s-bench-quest:
-  stage: serpent
+  stage: write-through
   script:
-    - make -j${NUM_JOBS} run-benchmarks defines=PITON_ARIANE+AXI64_CACHE_PORTS batch-mode=1
+    - make -j${NUM_JOBS} run-benchmarks defines=WT_DCACHE batch-mode=1
   dependencies:
     - build
 
 # rv64ui-p-* tests
 s-asm1-ver:
-  stage: serpent
+  stage: write-through
   script:
-    - make -j${NUM_JOBS} run-asm-tests1-verilator defines=PITON_ARIANE+AXI64_CACHE_PORTS
+    - make -j${NUM_JOBS} run-asm-tests1-verilator defines=WT_DCACHE
   dependencies:
     - build
 
 # rv64ui-v-* tests
 s-asm2-ver:
-  stage: serpent
+  stage: write-through
   script:
-    - make -j${NUM_JOBS} run-asm-tests2-verilator defines=PITON_ARIANE+AXI64_CACHE_PORTS
+    - make -j${NUM_JOBS} run-asm-tests2-verilator defines=WT_DCACHE
   dependencies:
     - build
 
 # rv64um-*-* tests
 mul-ver:
-  stage: serpent
+  stage: write-through
   script:
-    - make -j${NUM_JOBS} run-mul-verilator defines=PITON_ARIANE+AXI64_CACHE_PORTS
+    - make -j${NUM_JOBS} run-mul-verilator defines=WT_DCACHE
   dependencies:
     - build
 
 # atomics
 amo-ver:
-  stage: serpent
+  stage: write-through
   script:
-    - make -j${NUM_JOBS} run-amo-verilator defines=PITON_ARIANE+AXI64_CACHE_PORTS
+    - make -j${NUM_JOBS} run-amo-verilator defines=WT_DCACHE
   dependencies:
     - build
 
 # floating point
 s-fp-ver:
-  stage: serpent
+  stage: write-through
   script:
-    - make -j${NUM_JOBS} run-fp-verilator defines=PITON_ARIANE+AXI64_CACHE_PORTS
+    - make -j${NUM_JOBS} run-fp-verilator defines=WT_DCACHE
   dependencies:
     - build
 
 s-bench-ver:
-  stage: serpent
+  stage: write-through
   script:
-    - make -j${NUM_JOBS} run-benchmarks-verilator defines=PITON_ARIANE+AXI64_CACHE_PORTS
+    - make -j${NUM_JOBS} run-benchmarks-verilator defines=WT_DCACHE
   dependencies:
     - build
 
 s-icache-quest:
-  stage: serpent
+  stage: write-through
   script:
-    - cd tb/tb_serpent_icache/
+    - cd tb/tb_wt_icache/
     - make simc
     - "grep 'CI: PASSED' summary.rep"
 
 s-dcache-quest:
-  stage: serpent
+  stage: write-through
   script:
-    - cd tb/tb_serpent_dcache/
+    - cd tb/tb_wT_dcache/
     - make simc
     - "grep 'CI: PASSED' RD0_summary.rep"
     - "grep 'CI: PASSED' RD1_summary.rep"
@@ -247,9 +247,9 @@ s-dcache-quest:
     - build
 
 # s-torture:
-#   stage: serpent
+#   stage: write-through
 #   script:
-#     - make torture-rtest           defines=PITON_ARIANE+AXI64_CACHE_PORTS batch-mode=1
-#     - make torture-rtest-verilator defines=PITON_ARIANE+AXI64_CACHE_PORTS
+#     - make torture-rtest           defines=WT_DCACHE batch-mode=1
+#     - make torture-rtest-verilator defines=WT_DCACHE
 #   dependencies:
 #     - build

.travis.yml

@@ -81,34 +81,34 @@ jobs:
         - ci/install-dtc.sh
         - ci/install-spike.sh
     - stage: test
-      name: run riscv benchmarks
+      name: run riscv benchmarks (Write-Back Cache)
       script:
         - ci/build-riscv-tests.sh
-        - make -j${NUM_JOBS} run-benchmarks-verilator
+        - make -j${NUM_JOBS} run-benchmarks-verilator defines=WB_DCACHE
     # rv64ui-p-* tests
     - stage: test
-      name: run asm tests1
+      name: run asm tests1 (Write-Back Cache)
       script:
         - ci/build-riscv-tests.sh
-        - make -j${NUM_JOBS} run-asm-tests1-verilator
+        - make -j${NUM_JOBS} run-asm-tests1-verilator defines=WB_DCACHE
     # rv64ui-v-* tests
     - stage: test
-      name: run asm tests2
+      name: run asm tests2 (Write-Back Cache)
       script:
         - ci/build-riscv-tests.sh
-        - make -j${NUM_JOBS} run-asm-tests2-verilator
+        - make -j${NUM_JOBS} run-asm-tests2-verilator defines=WB_DCACHE
     # rv64um-*-* tests
     - stage: test
-      name: run mul tests
+      name: run mul tests (Write-Back Cache)
       script:
         - ci/build-riscv-tests.sh
-        - make -j${NUM_JOBS} run-mul-verilator
+        - make -j${NUM_JOBS} run-mul-verilator defines=WB_DCACHE
     # amo tests
     - stage: test
-      name: run amo tests
+      name: run amo tests (Write-Back Cache)
       script:
         - ci/build-riscv-tests.sh
-        - make -j${NUM_JOBS} run-amo-verilator
+        - make -j${NUM_JOBS} run-amo-verilator defines=WB_DCACHE
     - stage: test
       name: run torture
       script:
@@ -118,37 +118,35 @@ jobs:
         - make torture-rtest-verilator
 
     - stage: test
-      name: run riscv benchmarks (serpent)
+      name: run riscv benchmarks (Write-through Cache)
       script:
         - ci/build-riscv-tests.sh
-        - make -j${NUM_JOBS} run-benchmarks-verilator  defines=PITON_ARIANE+AXI64_CACHE_PORTS
+        - make -j${NUM_JOBS} run-benchmarks-verilator  defines=WT_DCACHE
     # rv64ui-p-* tests
     - stage: test
-      name: run asm tests1 (serpent)
+      name: run asm tests1 (Write-through Cache)
       script:
         - ci/build-riscv-tests.sh
-        - make -j${NUM_JOBS} run-asm-tests1-verilator  defines=PITON_ARIANE+AXI64_CACHE_PORTS
+        - make -j${NUM_JOBS} run-asm-tests1-verilator  defines=WT_DCACHE
     # rv64ui-v-* tests
     - stage: test
-      name: run asm tests2 (serpent)
+      name: run asm tests2 (Write-through Cache)
       script:
         - ci/build-riscv-tests.sh
-        - make -j${NUM_JOBS} run-asm-tests2-verilator  defines=PITON_ARIANE+AXI64_CACHE_PORTS
+        - make -j${NUM_JOBS} run-asm-tests2-verilator  defines=WT_DCACHE
     # amo tests
     - stage: test
       name: run amo tests
       script:
         - ci/build-riscv-tests.sh
-        - make -j${NUM_JOBS} run-amo-verilator defines=PITON_ARIANE+AXI64_CACHE_PORTS
+        - make -j${NUM_JOBS} run-amo-verilator defines=WT_DCACHE
     - stage: test
-      name: run torture (serpent)
+      name: run torture (Write-through Cache)
       script:
         - ci/get-torture.sh
         - make clean
-        - make torture-gen defines=PITON_ARIANE+AXI64_CACHE_PORTS
-        - make torture-rtest-verilator defines=PITON_ARIANE+AXI64_CACHE_PORTS
-
-
+        - make torture-gen defines=WT_DCACHE
+        - make torture-rtest-verilator defines=WT_DCACHE
 
 # extra time during long builds
 install: travis_wait

Flist.ariane

@@ -59,7 +59,7 @@ src/riscv-dbg/src/dm_pkg.sv
 include/riscv_pkg.sv
 include/ariane_pkg.sv
 include/ariane_axi_pkg.sv
-include/serpent_cache_pkg.sv
+include/wt_cache_pkg.sv
 //include/std_cache_pkg.sv
 include/axi_intf.sv
 src/util/instruction_tracer_pkg.sv
@@ -109,14 +109,14 @@ src/amo_buffer.sv
 src/store_unit.sv
 src/tlb.sv
 src/commit_stage.sv
-src/cache_subsystem/serpent_dcache_ctrl.sv
-src/cache_subsystem/serpent_dcache_mem.sv
-src/cache_subsystem/serpent_dcache_missunit.sv
-src/cache_subsystem/serpent_dcache_wbuffer.sv
-src/cache_subsystem/serpent_dcache.sv
-src/cache_subsystem/serpent_icache.sv
-src/cache_subsystem/serpent_l15_adapter.sv
-src/cache_subsystem/serpent_cache_subsystem.sv
+src/cache_subsystem/wt_dcache_ctrl.sv
+src/cache_subsystem/wt_dcache_mem.sv
+src/cache_subsystem/wt_dcache_missunit.sv
+src/cache_subsystem/wt_dcache_wbuffer.sv
+src/cache_subsystem/wt_dcache.sv
+src/cache_subsystem/wt_icache.sv
+src/cache_subsystem/wt_l15_adapter.sv
+src/cache_subsystem/wt_cache_subsystem.sv
 src/clint/clint.sv
 src/clint/axi_lite_interface.sv
 src/riscv-dbg/src/dm_csrs.sv

Makefile

@@ -21,7 +21,7 @@ verilator      ?= verilator
 # traget option
 target-options ?=
 # additional definess
-defines        ?=
+defines        ?= WT_DCACHE
 # test name for torture runs (binary name)
 test-location  ?= output/test
 # set to either nothing or -log
@@ -55,7 +55,7 @@ ariane_pkg := include/riscv_pkg.sv                          \
 			  src/riscv-dbg/src/dm_pkg.sv                   \
 			  include/ariane_pkg.sv                         \
 			  include/std_cache_pkg.sv                      \
-			  include/serpent_cache_pkg.sv                  \
+			  include/wt_cache_pkg.sv                       \
 			  src/axi/src/axi_pkg.sv                        \
 			  src/register_interface/src/reg_intf.sv        \
 			  include/axi_intf.sv                           \