Add reliable OBI

.gitignore

@@ -1 +1,4 @@
 .bender
+working_dir
+build
+fault_sim

.gitlab-ci.yml

@@ -3,20 +3,19 @@
 # SPDX-License-Identifier: SHL-0.51
 
 stages:
-  - build
   - sim
 
 variables:
-  VSIM: "questa-2022.3 vsim"
+  VSIM: "questa-2025.1-dz vsim"
+  VCS: "vcs-2024.09-zr vcs"
+  VLOGAN: "vcs-2024.09-zr vlogan"
 
-build:
-  stage: build
+sim:
+  stage: sim
   script:
-    - make build
+    - make all_vsim
 
-sim:
+sim-vcs:
   stage: sim
-  dependencies:
-    - build
   script:
-    - make all
+    - make all_vcs

Bender.lock

@@ -1,4 +1,20 @@
 packages:
+  apb:
+    revision: 77ddf073f194d44b9119949d2421be59789e69ae
+    version: 0.2.4
+    source:
+      Git: https://github.com/pulp-platform/apb.git
+    dependencies:
+    - common_cells
+  axi:
+    revision: f07498d53ecd5518b277c7d213ec3b71ca4df93c
+    version: 0.39.7
+    source:
+      Git: https://github.com/pulp-platform/axi.git
+    dependencies:
+    - common_cells
+    - common_verification
+    - tech_cells_generic
   common_cells:
     revision: 9afda9abb565971649c2aa0985639c096f351171
     version: 1.38.0
@@ -8,11 +24,31 @@ packages:
     - common_verification
     - tech_cells_generic
   common_verification:
-    revision: 9c07fa860593b2caabd9b5681740c25fac04b878
-    version: 0.2.3
+    revision: fb1885f48ea46164a10568aeff51884389f67ae3
+    version: 0.2.5
     source:
       Git: https://github.com/pulp-platform/common_verification.git
     dependencies: []
+  redundancy_cells:
+    revision: 766e376b7ddb70e744740e703a371f7fe7cc3e74
+    version: null
+    source:
+      Git: https://github.com/pulp-platform/redundancy_cells.git
+    dependencies:
+    - common_cells
+    - common_verification
+    - register_interface
+    - tech_cells_generic
+  register_interface:
+    revision: 5daa85d164cf6b54ad061ea1e4c6f3624556e467
+    version: 0.4.5
+    source:
+      Git: https://github.com/pulp-platform/register_interface.git
+    dependencies:
+    - apb
+    - axi
+    - common_cells
+    - common_verification
   tech_cells_generic:
     revision: 7968dd6e6180df2c644636bc6d2908a49f2190cf
     version: 0.2.13

Bender.yml

@@ -10,6 +10,7 @@ package:
 dependencies:
   common_cells: { git: "https://github.com/pulp-platform/common_cells.git", version: 1.38.0 }
   common_verification: { git: "https://github.com/pulp-platform/common_verification.git", version: 0.2.3 }
+  redundancy_cells: { git: "https://github.com/pulp-platform/redundancy_cells.git", rev: 766e376b7ddb70e744740e703a371f7fe7cc3e74 }
 
 export_include_dirs:
   - include
@@ -21,6 +22,7 @@ sources:
   - src/obi_intf.sv
   - src/obi_rready_converter.sv
   - src/apb_to_obi.sv
+  - src/obi_to_apb.sv
   # Level 3
   - src/obi_atop_resolver.sv
   - src/obi_cut.sv
@@ -29,12 +31,49 @@ sources:
   - src/obi_mux.sv
   - src/obi_sram_shim.sv
   # Level 4
+  - src/obi_isolate.sv
   - src/obi_xbar.sv
-  - target: test
+  - target: any(test, obi_test)
     files:
       - src/test/obi_asserter.sv
       - src/test/obi_test.sv
       - src/test/obi_sim_mem.sv
       - src/test/tb_obi_xbar.sv
       - src/test/atop_golden_mem_pkg.sv
       - src/test/tb_obi_atop_resolver.sv
+
+  - target: relOBI
+    files:
+      # Level 1
+      - src/relobi_pkg.sv
+      - src/relobi_tmr_r.sv
+      # Level 2
+      - src/relobi_a_other_decoder.sv
+      - src/relobi_a_other_encoder.sv
+      - src/relobi_a_other_corrector.sv
+      - src/relobi_r_other_decoder.sv
+      - src/relobi_r_other_encoder.sv
+      - src/relobi_r_other_corrector.sv
+      # Level 3
+      - src/relobi_decoder.sv
+      - src/relobi_encoder.sv
+      - src/relobi_corrector.sv
+      # Level 4
+      - src/relobi_cut.sv
+      - src/relobi_demux.sv
+      - src/relobi_err_sbr.sv
+      - src/relobi_mux.sv
+      - src/relobi_sram_shim.sv
+      # Level 5
+      - src/relobi_isolate.sv
+      - src/relobi_xbar.sv
+      - target: any(test, obi_test)
+        files:
+        - target: ZOIX
+          files:
+            - src/test/tb_relobi_xbar.sv
+          include_dirs:
+            - fault_sim
+        - target: not(ZOIX)
+          files:
+            - src/test/tb_relobi_xbar.sv

Makefile

@@ -4,32 +4,77 @@
 
 BENDER ?= bender
 VSIM ?= vsim
+VCS ?= vcs
+VLOGAN ?= vlogan
 
-AVAILABLE_TESTBENCHES = tb_obi_xbar tb_obi_atop_resolver
+BENDER_TARGETS := -t obi_test
+BENDER_TARGETS += -t relOBI
 
-scripts/compile.tcl:
+AVAILABLE_TESTBENCHES = tb_obi_xbar tb_obi_atop_resolver tb_relobi_xbar
+
+TBS_VSIM = $(addsuffix _vsim, $(AVAILABLE_TESTBENCHES))
+TBS_VCS = $(addsuffix _vcs, $(AVAILABLE_TESTBENCHES))
+
+# QuestaSim Flow
+scripts/compile_vsim.tcl: Bender.yml Bender.lock
 	mkdir -p scripts
-	$(BENDER) script vsim -t test --vlog-arg="-svinputport=compat" > $@
+	$(BENDER) script vsim $(BENDER_TARGETS) --vlog-arg="-svinputport=compat" > $@
 
-.PHONY: build
-build: scripts/compile.tcl
-	$(VSIM) -c -do 'exit -code [source scripts/compile.tcl]'
+.PHONY: build_vsim
+build_vsim: scripts/compile_vsim.tcl
+	$(VSIM) -c -do 'exit -code [source scripts/compile_vsim.tcl]'
 
-.PHONY: $(AVAILABLE_TESTBENCHES)
-$(AVAILABLE_TESTBENCHES): build
+.PHONY: $(TBS_VSIM)
+$(TBS_VSIM): build_vsim
 ifdef gui
-	$(VSIM) $@ -voptargs="+acc"
+	$(VSIM) $(patsubst %_vsim, %, $@) -voptargs="+acc"
 else
-	$(VSIM) -c $@ -do "run -all; quit -f"
+	$(VSIM) -c $(patsubst %_vsim, %, $@) -voptargs="+acc" -do "run -all; quit -f"
 endif
 
-.PHONY: all
-all: $(AVAILABLE_TESTBENCHES)
+.PHONY: all_vsim
+all_vsim: $(TBS_VSIM)
+
+# VCS Flow
+VCS_SCRIPT_ARGS += -assert svaext +v2k -override_timescale=10ns/10ps -kdb
+VCS_COMPILE_ARGS += -debug_access+all -override_timescale=10ns/10ps
+VCS_COMPILE_ARGS += +lint=TFIPC-L +lint=PCWM +warn=noCWUC +warn=noUII-L
+VCS_RUNTIME_ARGS =
+
+scripts/compile_vcs.sh: Bender.yml Bender.lock
+	mkdir -p scripts
+	$(BENDER) script vcs --vlogan-bin="$(VLOGAN)" $(BENDER_TARGETS) --vlog-arg="$(VCS_SCRIPT_ARGS)" > $@
+
+.PHONY: build_vcs
+build_vcs: scripts/compile_vcs.sh
+	mkdir -p build
+	chmod +x scripts/compile_vcs.sh
+	cd build && ../scripts/compile_vcs.sh
+
+build/%.sim: build_vcs
+	@if ! echo "$(AVAILABLE_TESTBENCHES)" | grep -wq "$*"; then \
+		echo "Error: $(basename $@) is not an available testbench"; \
+		echo "Available testbenches: $(AVAILABLE_TESTBENCHES)"; \
+		exit 1; \
+	fi
+	cd build && \
+	$(VCS) $(VCS_COMPILE_ARGS) -o $*.sim $*
+
+.PHONY: $(TBS_VCS)
+$(TBS_VCS):
+	@echo "Running VCS simulation for $@ as $(patsubst %_vcs,%,$@)"
+	$(MAKE) build/$(patsubst %_vcs,%,$@).sim
+	build/$(patsubst %_vcs,%,$@).sim $(VCS_RUNTIME_ARGS)
+
+.PHONY: all_vcs
+all_vcs: $(TBS_VCS)
 
 .PHONY: clean
 clean:
-	rm -f scripts/compile.tcl
+	rm -f scripts/compile_vsim.tcl
 	rm -rf work
 	rm -f modelsim.ini
 	rm -f transcript
 	rm -f vsim.wlf
+	rm -f scripts/compile_vcs.sh
+	rm -rf build

include/obi/assign.svh

@@ -27,46 +27,11 @@
   __opt_as __lhs``__lhs_sep``r_optional = __rhs``__rhs_sep``r_optional;
 `define __OBI_TO_REQ(__opt_as, __lhs, __lhs_sep, __rhs, __rhs_sep, __lhscfg, __rhscfg) \
   `__OBI_TO_A(__opt_as, __lhs, __lhs_sep, __rhs, __rhs_sep)                            \
-  __opt_as __lhs.req                   = __rhs.req;                                    \
-  if (__lhscfg.UseRReady) begin                                                        \
-    if (__rhscfg.UseRReady) begin                                                      \
-      __opt_as __lhs.rready            = __rhs.rready;                                 \
-      if (__lhscfg.Integrity) begin                                                    \
-        if (__rhscfg.Integrity) begin                                                  \
-          __opt_as __lhs.rreadypar     = __rhs.rreadypar;                              \
-        end else begin                                                                 \
-          __opt_as __lhs.rreadypar     = ~__rhs.rready;                                \
-        end                                                                            \
-      end                                                                              \
-    end else begin                                                                     \
-      __opt_as __lhs.rready            = 1'b1;                                         \
-      if (__lhscfg.Integrity) begin                                                    \
-        __opt_as __lhs.rreadypar       = 1'b0;                                         \
-      end                                                                              \
-    end                                                                                \
-  end else if (__rhscfg.UseRReady) begin                                               \
-    $error("Incompatible Configs! Please assign manually!");                           \
-  end                                                                                  \
-  if (__lhscfg.Integrity) begin                                                        \
-    if (__rhscfg.Integrity) begin                                                      \
-      __opt_as __lhs.reqpar           = __rhs.reqpar;                                  \
-    end else begin                                                                     \
-      __opt_as __lhs.reqpar           = ~__rhs.req;                                    \
-    end                                                                                \
-  end
+  __opt_as __lhs.req                   = __rhs.req;
 `define __OBI_TO_RSP(__opt_as, __lhs, __lhs_sep, __rhs, __rhs_sep, __lhscfg, __rhscfg) \
   `__OBI_TO_R(__opt_as, __lhs, __lhs_sep, __rhs, __rhs_sep)                            \
   __opt_as __lhs.gnt                   = __rhs.gnt;                                    \
-  __opt_as __lhs.rvalid                = __rhs.rvalid;                                 \
-  if (__lhscfg.Integrity) begin                                                        \
-    if (__rhscfg.Integrity) begin                                                      \
-      __opt_as __lhs.gntpar              = __rhs.gntpar;                               \
-      __opt_as __lhs.rvalidpar           = __rhs.rvalidpar;                            \
-    end else begin                                                                     \
-      __opt_as __lhs.gntpar              = ~__rhs.gnt;                                 \
-      __opt_as __lhs.rvalidpar           = ~__rhs.rvalid;                              \
-    end                                                                                \
-  end
+  __opt_as __lhs.rvalid                = __rhs.rvalid;
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
@@ -86,36 +51,10 @@
 `define OBI_ASSIGN_A(dst, src, dstcfg, srccfg)               \
   `__OBI_TO_A(assign, dst, ., src, .)                        \
   assign dst.req = src.req;                                  \
-  assign src.gnt = dst.gnt;                                  \
-  if (dstcfg.Integrity && srccfg.Integrity) begin            \
-    assign dst.reqpar = src.reqpar;                          \
-    assign src.gntpar = dst.gntpar;                          \
-  end else if (dstcfg.Integrity ^ srccfg.Integrity) begin    \
-    $error("Incompatible Configs! Please assign manually!"); \
-  end
+  assign src.gnt = dst.gnt;
 `define OBI_ASSIGN_R(dst, src, dstcfg, srccfg)               \
   `__OBI_TO_R(assign, dst, ., src, .)                        \
-  assign dst.rvalid = src.rvalid;                            \
-  if (dstcfg.Integrity && srccfg.Integrity) begin            \
-    assign dst.rvalidpar = src.rvalidpar;                    \
-  end else if (dstcfg.Integrity ^ srccfg.Integrity) begin    \
-    $error("Incompatible Configs! Please assign manually!"); \
-  end                                                        \
-  if (srccfg.UseRReady) begin                                \
-    if (dstcfg.UseRReady) begin                              \
-      assign src.rready = dst.rready;                        \
-      if (srccfg.Integrity && dstcfg.Integrity) begin        \
-        assign src.rreadypar = dst.rreadypar;                \
-      end                                                    \
-    end else begin                                           \
-      assign src.rready = 1'b1;                              \
-      if (srccfg.Integrity) begin                            \
-        assign src.rreadypar = 1'b0;                         \
-      end                                                    \
-    end                                                      \
-  end else if (dstcfg.UseRReady) begin                       \
-    $error("Incompatible Configs! Please assign manually!"); \
-  end
+  assign dst.rvalid = src.rvalid;
 `define OBI_ASSIGN(sbr, mgr, sbrcfg, mgrcfg) \
   `OBI_ASSIGN_A(sbr, mgr, sbrcfg, mgrcfg)    \
   `OBI_ASSIGN_R(mgr, sbr, mgrcfg, sbrcfg)