diff --git a/dataflow_neuro/primitives.act b/dataflow_neuro/primitives.act index 8f1db88..7a433a3 100644 --- a/dataflow_neuro/primitives.act +++ b/dataflow_neuro/primitives.act @@ -286,8 +286,8 @@ namespace tmpl { out1_t_buf_func[i].sr_B = _reset_BXX[i]; out1_f_buf_func[i].pr_B = _reset_BXX[i]; out1_f_buf_func[i].sr_B = _reset_BXX[i]; - out1_f_buf_func[i].n2=_c_t_buf[i]; - out1_t_buf_func[i].n2=_c_t_buf[i]; + out1_f_buf_func[i].n2=_c_f_buf[i]; + out1_t_buf_func[i].n2=_c_f_buf[i]; ) //func buffer out2 @@ -316,8 +316,8 @@ namespace tmpl { out2_t_buf_func[i].sr_B = _reset_BXX[i+N-1]; out2_f_buf_func[i].pr_B = _reset_BXX[i+N-1]; out2_f_buf_func[i].sr_B = _reset_BXX[i+N-1]; - out2_f_buf_func[i].n2=_c_f_buf[i]; - out2_t_buf_func[i].n2=_c_f_buf[i]; + out2_f_buf_func[i].n2=_c_t_buf[i]; + out2_t_buf_func[i].n2=_c_t_buf[i]; ) } @@ -850,14 +850,18 @@ defproc slice_data(avMx1of2 in; avMx1of2 out; _N1 = std::min(N1,N); _N0 = std::max(N0,0); - BUF_X1 ack_buf(.a = out.a, .y = in.a, .vss = supply.vss, .vdd = supply.vdd); + + // BUF_X1 ack_buf(.a = out.a, .y = in.a, .vss = supply.vss, .vdd = supply.vdd); vtree in_vt(.in = in.d, .out = in.v, .supply = supply); (i:_N1-_N0: in.d.d[i + _N0] = out.d.d[i]; ) - in.a = out.a; + // in.a = out.a; + + A_2C_B_X1 Cel(.c1 = out.a, .c2 =in.v, .y = in.a, .vss = supply.vss, .vdd = supply.vdd); + }