From 71826a59b8dcbd6992774cf50803f0f1f1b6e2f1 Mon Sep 17 00:00:00 2001 From: Kamil Rakoczy Date: Mon, 3 Jan 2022 10:35:10 +0100 Subject: [PATCH 1/2] Bump Surelog Signed-off-by: Kamil Rakoczy --- .github/workflows/main.yml | 5 ++++- Surelog | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f5011c47..bd36667e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -22,7 +22,10 @@ jobs: - name: Install dependencies run: | apt-get update -qq - apt install -y g++-9 build-essential cmake tclsh ant default-jre swig google-perftools libgoogle-perftools-dev python3 python3-dev uuid uuid-dev tcl-dev flex libfl-dev git pkg-config libreadline-dev bison libffi-dev wget ccache + apt install -y g++-9 build-essential cmake tclsh ant default-jre swig google-perftools libgoogle-perftools-dev python3 python3-dev python3-pip uuid uuid-dev tcl-dev flex libfl-dev git pkg-config libreadline-dev bison libffi-dev wget ccache + update-alternatives --install /usr/bin/python python /usr/bin/python3 1 + update-alternatives --install /usr/bin/pip pip /usr/bin/pip3 1 + pip install orderedmultidict - uses: actions/checkout@v2 with: diff --git a/Surelog b/Surelog index ffbbebdb..76a3026a 160000 --- a/Surelog +++ b/Surelog @@ -1 +1 @@ -Subproject commit ffbbebdb8b3f48539a02f4c80019fe39e2c6339e +Subproject commit 76a3026a520eefe9b7f27e79af2ab91c6512b556 From 99357424d3bfe46843db4c7958e98343a3fd2ad5 Mon Sep 17 00:00:00 2001 From: Kamil Rakoczy Date: Tue, 4 Jan 2022 12:10:30 +0100 Subject: [PATCH 2/2] Update swerv patch Signed-off-by: Kamil Rakoczy --- uhdm-tests/swerv/0001-swerv.patch | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/uhdm-tests/swerv/0001-swerv.patch b/uhdm-tests/swerv/0001-swerv.patch index ee2e9d8a..f0415039 100644 --- a/uhdm-tests/swerv/0001-swerv.patch +++ b/uhdm-tests/swerv/0001-swerv.patch @@ -87,7 +87,7 @@ index 5110c1b..8ef38e8 100644 ({32{w2v[j]}} & wd2[31:0]); end diff --git a/design/dec/dec_tlu_ctl.sv b/design/dec/dec_tlu_ctl.sv -index 52a4393..b5cc73f 100644 +index 52a4393..2564a61 100644 --- a/design/dec/dec_tlu_ctl.sv +++ b/design/dec/dec_tlu_ctl.sv @@ -191,8 +191,10 @@ module dec_tlu_ctl @@ -156,7 +156,8 @@ index 52a4393..b5cc73f 100644 - })); + .dout({dec_tlu_br0_wb_pkt[6:2], dec_tlu_br1_wb_pkt[6:2]})); - rvdff #(2*$bits(dec_tlu_br0_addr_e4[`RV_BTB_ADDR_HI:`RV_BTB_ADDR_LO])) +- rvdff #(2*$bits(dec_tlu_br0_addr_e4[`RV_BTB_ADDR_HI:`RV_BTB_ADDR_LO])) ++ rvdff #(2*$bits(dec_tlu_br0_addr_e4)) bp_wb_index_ff (.*, .clk(e4e5_clk), .din({dec_tlu_br0_addr_e4[`RV_BTB_ADDR_HI:`RV_BTB_ADDR_LO], dec_tlu_br1_addr_e4[`RV_BTB_ADDR_HI:`RV_BTB_ADDR_LO]}),