From 7891b315cfdfad9b5334e6eba3848c097617403b Mon Sep 17 00:00:00 2001 From: waleed-lm Date: Wed, 14 Oct 2020 09:58:21 +0500 Subject: [PATCH] Aligner Updated --- el2_ifu_aln_ctl.fir | 2 +- el2_ifu_aln_ctl.v | 4 ++-- src/main/scala/ifu/el2_ifu_aln_ctl.scala | 2 +- .../classes/ifu/el2_ifu_aln_ctl.class | Bin 192514 -> 192513 bytes 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/el2_ifu_aln_ctl.fir b/el2_ifu_aln_ctl.fir index 3d3bef47..768e4700 100644 --- a/el2_ifu_aln_ctl.fir +++ b/el2_ifu_aln_ctl.fir @@ -2440,7 +2440,7 @@ circuit el2_ifu_aln_ctl : node f0ictype = bits(misc0eff, 52, 51) @[el2_ifu_aln_ctl.scala 218:26] node f0prett = bits(misc0eff, 50, 18) @[el2_ifu_aln_ctl.scala 219:25] node f0poffset = bits(misc0eff, 17, 5) @[el2_ifu_aln_ctl.scala 220:27] - node f0fghr = bits(misc0eff, 4, 0) @[el2_ifu_aln_ctl.scala 221:24] + node f0fghr = bits(misc0eff, 7, 0) @[el2_ifu_aln_ctl.scala 221:24] node _T_225 = bits(io.ifu_bp_hist1_f, 1, 1) @[el2_ifu_aln_ctl.scala 223:37] node _T_226 = bits(io.ifu_bp_hist0_f, 1, 1) @[el2_ifu_aln_ctl.scala 223:58] node _T_227 = bits(io.ifu_bp_pc4_f, 1, 1) @[el2_ifu_aln_ctl.scala 223:77] diff --git a/el2_ifu_aln_ctl.v b/el2_ifu_aln_ctl.v index 2795aa8d..fd6d3ee6 100644 --- a/el2_ifu_aln_ctl.v +++ b/el2_ifu_aln_ctl.v @@ -817,7 +817,7 @@ module el2_ifu_aln_ctl( wire [1:0] f0ictype = misc0eff[52:51]; // @[el2_ifu_aln_ctl.scala 218:26] wire [32:0] f0prett = misc0eff[50:18]; // @[el2_ifu_aln_ctl.scala 219:25] wire [12:0] f0poffset = misc0eff[17:5]; // @[el2_ifu_aln_ctl.scala 220:27] - wire [4:0] f0fghr = misc0eff[4:0]; // @[el2_ifu_aln_ctl.scala 221:24] + wire [7:0] f0fghr = misc0eff[7:0]; // @[el2_ifu_aln_ctl.scala 221:24] wire [23:0] _T_250 = {brdata1,brdata0}; // @[Cat.scala 29:58] wire [23:0] _T_253 = {brdata2,brdata1}; // @[Cat.scala 29:58] wire [23:0] _T_256 = {brdata0,brdata2}; // @[Cat.scala 29:58] @@ -984,7 +984,7 @@ module el2_ifu_aln_ctl( assign io_ifu_fb_consume1 = _T_312 & _T_1; // @[el2_ifu_aln_ctl.scala 55:22 el2_ifu_aln_ctl.scala 258:22] assign io_ifu_fb_consume2 = _T_315 & _T_1; // @[el2_ifu_aln_ctl.scala 56:22 el2_ifu_aln_ctl.scala 259:22] assign io_ifu_i0_bp_index = _T_738 ? firstpc_hash : secondpc_hash; // @[el2_ifu_aln_ctl.scala 57:22 el2_ifu_aln_ctl.scala 400:22] - assign io_ifu_i0_bp_fghr = i0_ends_f1 ? f1fghr : {{3'd0}, f0fghr}; // @[el2_ifu_aln_ctl.scala 58:21 el2_ifu_aln_ctl.scala 402:21] + assign io_ifu_i0_bp_fghr = i0_ends_f1 ? f1fghr : f0fghr; // @[el2_ifu_aln_ctl.scala 58:21 el2_ifu_aln_ctl.scala 402:21] assign io_ifu_i0_bp_btag = _T_738 ? firstbrtag_hash : secondbrtag_hash; // @[el2_ifu_aln_ctl.scala 59:21 el2_ifu_aln_ctl.scala 404:21] assign io_ifu_pmu_instr_aligned = io_dec_i0_decode_d & _T_785; // @[el2_ifu_aln_ctl.scala 60:28 el2_ifu_aln_ctl.scala 410:28] assign io_ifu_i0_cinst = aligndata[15:0]; // @[el2_ifu_aln_ctl.scala 61:19 el2_ifu_aln_ctl.scala 346:19] diff --git a/src/main/scala/ifu/el2_ifu_aln_ctl.scala b/src/main/scala/ifu/el2_ifu_aln_ctl.scala index 088ddbf8..913f4b09 100644 --- a/src/main/scala/ifu/el2_ifu_aln_ctl.scala +++ b/src/main/scala/ifu/el2_ifu_aln_ctl.scala @@ -218,7 +218,7 @@ class el2_ifu_aln_ctl extends Module with el2_lib with RequireAsyncReset { val f0ictype = misc0eff(MHI-2, MHI-3) val f0prett = misc0eff(MHI-4,MHI-36) val f0poffset = misc0eff(MHI-37, MHI-49) - val f0fghr = misc0eff(MHI-50, 0) + val f0fghr = misc0eff(BHT_GHR_SIZE-1, 0) brdata_in := Cat(io.ifu_bp_hist1_f(1),io.ifu_bp_hist0_f(1),io.ifu_bp_pc4_f(1),io.ifu_bp_way_f(1),io.ifu_bp_valid_f(1), io.ifu_bp_ret_f(1), io.ifu_bp_hist1_f(0),io.ifu_bp_hist0_f(0),io.ifu_bp_pc4_f(0),io.ifu_bp_way_f(0), diff --git a/target/scala-2.12/classes/ifu/el2_ifu_aln_ctl.class b/target/scala-2.12/classes/ifu/el2_ifu_aln_ctl.class index 9f477d4ef23a9f5295d6f3ee9dd3f7c1b3872021..d1f394dfeeab510a94ce85b5892406930c0903be 100644 GIT binary patch delta 2294 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