From a8519b8c4fb55ee83faca8f2805dba7e404b0e6f Mon Sep 17 00:00:00 2001 From: waleed-lm Date: Tue, 29 Sep 2020 09:54:58 +0500 Subject: [PATCH] IFC --- el2_ifu_compress_ctl.fir | 4 ++-- el2_ifu_compress_ctl.v | 17 ++++++++--------- src/main/scala/ifu/el2_ifu_compress_ctl.scala | 2 +- .../classes/ifu/el2_ifu_compress_ctl.class | Bin 101848 -> 101848 bytes 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/el2_ifu_compress_ctl.fir b/el2_ifu_compress_ctl.fir index 1ed65631..b432c960 100644 --- a/el2_ifu_compress_ctl.fir +++ b/el2_ifu_compress_ctl.fir @@ -1432,13 +1432,13 @@ circuit el2_ifu_compress_ctl : io.l2_31 <= _T_1332 @[el2_ifu_compress_ctl.scala 144:12] node _T_1333 = bits(l1, 19, 12) @[el2_ifu_compress_ctl.scala 154:17] node _T_1334 = bits(sjaloffset11_1, 0, 0) @[el2_ifu_compress_ctl.scala 154:52] - node _T_1335 = bits(sjald, 19, 11) @[el2_ifu_compress_ctl.scala 154:65] + node _T_1335 = bits(sjald, 19, 12) @[el2_ifu_compress_ctl.scala 154:65] node _T_1336 = bits(sluimm17_12, 0, 0) @[el2_ifu_compress_ctl.scala 155:49] node _T_1337 = bits(sluimmd, 7, 0) @[el2_ifu_compress_ctl.scala 155:64] node _T_1338 = mux(_T_1334, _T_1335, UInt<1>("h00")) @[Mux.scala 27:72] node _T_1339 = mux(_T_1336, _T_1337, UInt<1>("h00")) @[Mux.scala 27:72] node _T_1340 = or(_T_1338, _T_1339) @[Mux.scala 27:72] - wire _T_1341 : UInt<9> @[Mux.scala 27:72] + wire _T_1341 : UInt<8> @[Mux.scala 27:72] _T_1341 <= _T_1340 @[Mux.scala 27:72] node l2_19 = or(_T_1333, _T_1341) @[el2_ifu_compress_ctl.scala 154:25] node _T_1342 = bits(l1, 11, 0) @[el2_ifu_compress_ctl.scala 156:35] diff --git a/el2_ifu_compress_ctl.v b/el2_ifu_compress_ctl.v index 22f974db..f75bae16 100644 --- a/el2_ifu_compress_ctl.v +++ b/el2_ifu_compress_ctl.v @@ -9,7 +9,7 @@ module el2_ifu_compress_ctl( output io_legal, output [31:0] io_o, output [11:0] io_l2_31, - output [8:0] io_l2_19 + output [7:0] io_l2_19 ); wire _T_2 = ~io_din[14]; // @[el2_ifu_compress_ctl.scala 21:83] wire _T_4 = ~io_din[13]; // @[el2_ifu_compress_ctl.scala 21:83] @@ -373,13 +373,12 @@ module el2_ifu_compress_ctl( wire [11:0] _T_1328 = _T_1327 | _T_1321; // @[Mux.scala 27:72] wire [11:0] _T_1329 = _T_1328 | _T_1322; // @[Mux.scala 27:72] wire [11:0] _T_1330 = _T_1329 | _T_1323; // @[Mux.scala 27:72] - wire [8:0] _T_1338 = _T_228 ? sjald[19:11] : 9'h0; // @[Mux.scala 27:72] + wire [7:0] _T_1338 = _T_228 ? sjald[19:12] : 8'h0; // @[Mux.scala 27:72] wire [7:0] _T_1339 = sluimm17_12 ? sluimmd[7:0] : 8'h0; // @[Mux.scala 27:72] - wire [8:0] _GEN_0 = {{1'd0}, _T_1339}; // @[Mux.scala 27:72] - wire [8:0] _T_1340 = _T_1338 | _GEN_0; // @[Mux.scala 27:72] - wire [8:0] _GEN_1 = {{1'd0}, l1[19:12]}; // @[el2_ifu_compress_ctl.scala 154:25] - wire [8:0] l2_19 = _GEN_1 | _T_1340; // @[el2_ifu_compress_ctl.scala 154:25] - wire [32:0] l2 = {io_l2_31,l2_19,l1[11:0]}; // @[Cat.scala 29:58] + wire [7:0] _T_1340 = _T_1338 | _T_1339; // @[Mux.scala 27:72] + wire [7:0] l2_19 = l1[19:12] | _T_1340; // @[el2_ifu_compress_ctl.scala 154:25] + wire [19:0] _T_1343 = {io_l2_31,l2_19}; // @[Cat.scala 29:58] + wire [31:0] l2 = {io_l2_31,l2_19,l1[11:0]}; // @[Cat.scala 29:58] wire [8:0] sbr8d = {io_din[12],io_din[6],io_din[5],io_din[2],io_din[11],io_din[10],io_din[4],io_din[3],1'h0}; // @[Cat.scala 29:58] wire [6:0] uswimm6d = {io_din[5],io_din[12:10],io_din[6],2'h0}; // @[Cat.scala 29:58] wire [7:0] uswspimm7d = {io_din[8:7],io_din[12:9],2'h0}; // @[Cat.scala 29:58] @@ -524,10 +523,10 @@ module el2_ifu_compress_ctl( wire [30:0] _T_1783 = {_T_1780,_T_228,out_2,1'h1}; // @[Cat.scala 29:58] assign io_dout = l3 & _T_1752; // @[el2_ifu_compress_ctl.scala 182:10] assign io_l1 = {_T_1234,_T_1232}; // @[el2_ifu_compress_ctl.scala 183:9] - assign io_l2 = l2[31:0]; // @[el2_ifu_compress_ctl.scala 184:9] + assign io_l2 = {_T_1343,l1[11:0]}; // @[el2_ifu_compress_ctl.scala 184:9] assign io_l3 = {_T_1403,_T_1402}; // @[el2_ifu_compress_ctl.scala 185:9] assign io_legal = _T_1743 | _T_1750; // @[el2_ifu_compress_ctl.scala 186:12] assign io_o = {_T_1783,1'h1}; // @[el2_ifu_compress_ctl.scala 188:8] assign io_l2_31 = l1[31:20] | _T_1330; // @[el2_ifu_compress_ctl.scala 144:12] - assign io_l2_19 = _GEN_1 | _T_1340; // @[el2_ifu_compress_ctl.scala 187:12] + assign io_l2_19 = l1[19:12] | _T_1340; // @[el2_ifu_compress_ctl.scala 187:12] endmodule diff --git a/src/main/scala/ifu/el2_ifu_compress_ctl.scala b/src/main/scala/ifu/el2_ifu_compress_ctl.scala index 6f7d8109..8905064a 100644 --- a/src/main/scala/ifu/el2_ifu_compress_ctl.scala +++ b/src/main/scala/ifu/el2_ifu_compress_ctl.scala @@ -151,7 +151,7 @@ class el2_ifu_compress_ctl extends Module { sjaloffset11_1.asBool->Cat(sjald(19), sjald(9,0), sjald(10)), sluimm17_12.asBool->sluimmd(19,8))) - val l2_19 = l1(19,12) | Mux1H(Seq(sjaloffset11_1.asBool->sjald(19,11), + val l2_19 = l1(19,12) | Mux1H(Seq(sjaloffset11_1.asBool->sjald(19,12), sluimm17_12.asBool->sluimmd(7,0))) val l2 = Cat(io.l2_31, l2_19, l1(11,0)) diff --git a/target/scala-2.12/classes/ifu/el2_ifu_compress_ctl.class b/target/scala-2.12/classes/ifu/el2_ifu_compress_ctl.class index 4f08cb628f2695c28f7a8a16c6285a06217d9e5c..369b0d4974dd1496943201db8a8b1c8daec57240 100644 GIT binary patch delta 16 YcmcaHo9)JIwheP{G4gDlcgt!s07j<>KL7v# delta 16 YcmcaHo9)JIwheP{F>-I7cgt!s07jt*J^%m!