Merge branch 'dev' of ssh://git.web.rug.nl:222/bics/actlib_dataflow_neuro into dev

This commit is contained in:
alexmadison 2022-04-11 19:43:19 +02:00
commit a2ca30cbb7
1 changed files with 7 additions and 7 deletions

View File

@ -252,8 +252,8 @@ defproc decoder_2d_hs (avMx1of2<NxC+NyC> in; a1of1 out[Nx*Ny]; bool? reset_B; po
(i:Nx: (i:Nx:
(j:Ny: (j:Ny:
index = i + Nx*j; index = i + Nx*j;
ack_pulldowns[index].a = out[index].a; ack_pulldowns[index].n1 = out[index].a;
ack_pulldowns[index].b = d_dr_xX[i].out[j]; ack_pulldowns[index].n2 = d_dr_xX[i].out[j];
ack_pulldowns[index].y = _out_acksB[i]; ack_pulldowns[index].y = _out_acksB[i];
ack_pulldowns[index].vss = supply.vss; ack_pulldowns[index].vss = supply.vss;
ack_pulldowns[index].vdd = supply.vdd; ack_pulldowns[index].vdd = supply.vdd;
@ -362,8 +362,8 @@ defproc decoder_2d_hybrid (avMx1of2<NxC+NyC> in; a1of1 out[Nx*Ny]; bool? dly_cfg
(i:Nx: (i:Nx:
(j:Ny: (j:Ny:
index = i + Nx*j; index = i + Nx*j;
ack_pulldowns[index].a = out[index].a; ack_pulldowns[index].n1 = out[index].a;
ack_pulldowns[index].b = d_dr_xX[i].out[j]; ack_pulldowns[index].n2 = d_dr_xX[i].out[j];
ack_pulldowns[index].y = _out_acksB[i]; ack_pulldowns[index].y = _out_acksB[i];
ack_pulldowns[index].vss = supply.vss; ack_pulldowns[index].vss = supply.vss;
ack_pulldowns[index].vdd = supply.vdd; ack_pulldowns[index].vdd = supply.vdd;
@ -378,8 +378,8 @@ defproc decoder_2d_hybrid (avMx1of2<NxC+NyC> in; a1of1 out[Nx*Ny]; bool? dly_cfg
A_2P_U_X4 pu[Nx]; // TODO probably replace this with variable strength PU A_2P_U_X4 pu[Nx]; // TODO probably replace this with variable strength PU
A_1P_U_X4 pu_reset[Nx]; A_1P_U_X4 pu_reset[Nx];
(i:Nx: (i:Nx:
pu[i].a = d_dr_xX[i].out[Ny]; pu[i].p1 = d_dr_xX[i].out[Ny];
pu[i].b = hs_enB; pu[i].p2 = hs_enB;
pu[i].y = _out_acksB[i]; pu[i].y = _out_acksB[i];
pu[i].vdd = supply.vdd; pu[i].vdd = supply.vdd;
pu[i].vss = supply.vss; pu[i].vss = supply.vss;
@ -907,7 +907,7 @@ defproc decoder_2d_hybrid (avMx1of2<NxC+NyC> in; a1of1 out[Nx*Ny]; bool? dly_cfg
// y_req pull up // y_req pull up
bool _reqB; bool _reqB;
INV_X1 req_inv(.a = _req, .y = _reqB, .vdd= supply.vdd, .vss = supply.vss); INV_X1 req_inv(.a = _req, .y = _reqB, .vdd= supply.vdd, .vss = supply.vss);
A_2P_U_X4 pu_y(.a = _reqB, .b = outy.a, .y = outy.r, .vdd = supply.vdd, .vss = supply.vss); A_2P_U_X4 pu_y(.p1 = _reqB, .p2 = outy.a, .y = outy.r, .vdd = supply.vdd, .vss = supply.vss);
// x_req pull up // x_req pull up
A_3P_U_X4 pu_x(.a = outx.a, .b = _reqB, .c = _y_a_B, .y = outx.r, A_3P_U_X4 pu_x(.a = outx.a, .b = _reqB, .c = _y_a_B, .y = outx.r,