pulp-platform · WRoenninger · Jun 29, 2020 · Jun 29, 2020 · Jun 29, 2020 · Jun 30, 2020
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - `axi_lite_to_apb`: Make pipeline registers on request and response path optional (can be enabled
  with the new `PipelineRequest` and `PipelineResponse` `parameter`s), and disable those pipeline
  registers by default.
+- `axi_xbar`: Flatten and update parameter and ports according to (#153). Add inline documentation.
+  - Remove `doc/axi_xbar.md`.
+  - Move `doc/svg/axi_xbar.svg` and `doc/axi_xbar.png` to `docs/`.
+- `axi_demux`: Flatten and update parameter and ports according to (#153). Add inline documentation.
+  - Remove `doc/axi_demux.md`.
+  - Move `doc/svg/axi_demux.svg` and `doc/axi_demux.png` to `docs/`.

 ### Fixed


diff --git a/doc/axi_demux.md b/doc/axi_demux.md
diff --git a/doc/axi_xbar.md b/doc/axi_xbar.md
diff --git a/doc/axi_demux.png → docs/axi_demux.png b/doc/axi_demux.png → docs/axi_demux.png
diff --git a/doc/axi_xbar.png → docs/axi_xbar.png b/doc/axi_xbar.png → docs/axi_xbar.png
diff --git a/doc/svg/axi_demux.svg → docs/svg/axi_demux.svg b/doc/svg/axi_demux.svg → docs/svg/axi_demux.svg
diff --git a/doc/svg/axi_xbar.svg → docs/svg/axi_xbar.svg b/doc/svg/axi_xbar.svg → docs/svg/axi_xbar.svg
diff --git a/scripts/run_vsim.sh b/scripts/run_vsim.sh
@@ -103,6 +103,26 @@ exec_test() {
                done
            done
            ;;
+        axi_xbar)
+            for GEN_ATOP in 0 1; do
+                for NUM_MST in 1 6; do
+                    for NUM_SLV in 2 9; do
+                        for MST_ID_USE in 3 5; do
+                            MST_ID=5
+                            for DATA_WIDTH in 64 256; do
+                                call_vsim tb_axi_xbar -t 1ns -voptargs="+acc" \
+                                    -gTbNumMasters=$NUM_MST       \
+                                    -gTbNumSlaves=$NUM_SLV        \
+                                    -gTbAxiIdWidthMasters=$MST_ID \
+                                    -gTbAxiIdUsed=$MST_ID_USE     \
+                                    -gTbAxiDataWidth=$DATA_WIDTH  \
+                                    -gTbEnableAtops=$GEN_ATOP
+                            done
+                        done
+                    done
+                done
+            done
+            ;;
        *)
            call_vsim tb_$1 -t 1ns -coverage -voptargs="+acc +cover=bcesfx"
            ;;