Commit 886497c1 authored by Leonardo Solis's avatar Leonardo Solis
Browse files

cleanup write_pipe comments


Former-commit-id: fb4ece42
parent 28874c74
......@@ -508,10 +508,7 @@ while(active) {
tmp.s0 = tmp_coords[0].x; tmp.s1 = tmp_coords[0].y; tmp.s2 = tmp_coords[0].z; //tmp.s3
tmp.s4 = tmp_coords[1].x; tmp.s5 = tmp_coords[1].y; tmp.s6 = tmp_coords[1].z; //tmp.s7
#endif
/*
write_channel_altera(chan_Conf2Intere_xyz, tmp);
write_channel_altera(chan_Conf2Intrae_xyz, tmp);
*/
write_pipe_block(chan_Conf2Intere_xyz, &tmp);
write_pipe_block(chan_Conf2Intrae_xyz, &tmp);
}
......
......@@ -546,13 +546,6 @@ void Krnl_GA(
LOOP_FOR_GA_IC_OUTER:
for (ushort pop_cnt = 0; pop_cnt < DockConst_pop_size; pop_cnt++) {
// Calculate energy
/*
write_channel_altera(chan_GA2IGL_IC_active, true);
*/
/*
const bool tmp_bool_true = true;
write_pipe_block(chan_GA2IGL_IC_active, &tmp_bool_true);
*/
const int tmp_int_zero = 0;
write_pipe_block(chan_GA2IGL_IC_active, &tmp_int_zero);
......@@ -568,9 +561,7 @@ void Krnl_GA(
#else
tmp_ic = GlobPopulationCurrent[pop_cnt*ACTUAL_GENOTYPE_LENGTH + pipe_cnt];
#endif
/*
write_channel_altera(chan_IC2Conf_genotype, LocalPopCurr[pop_cnt][pipe_cnt & MASK_GENOTYPE]);
*/
LocalPopCurr[pop_cnt][pipe_cnt & MASK_GENOTYPE] = tmp_ic;
write_pipe_block(chan_IC2Conf_genotype, &tmp_ic);
}
......@@ -818,13 +809,7 @@ void Krnl_GA(
// Reuse of bt prng float as crossover-rate
bool crossover_yes = (DockConst_crossover_rate > bt_tmp_f0);
/*
write_channel_altera(chan_GA2IGL_GG_active, true);
*/
/*
const bool tmp_bool_true = true;
write_pipe_block(chan_GA2IGL_GG_active, &tmp_bool_true);
*/
const int tmp_int_zero = 0;
write_pipe_block(chan_GA2IGL_GG_active, &tmp_int_zero);
/*
......@@ -876,9 +861,6 @@ void Krnl_GA(
// Calculate energy
LocalPopNext [new_pop_cnt][gene_cnt & MASK_GENOTYPE] = tmp_offspring;
/*
write_channel_altera(chan_GG2Conf_genotype, tmp_offspring);
*/
write_pipe_block(chan_GG2Conf_genotype, &tmp_offspring);
//printf("test point 5\n");
}
......@@ -966,17 +948,6 @@ void Krnl_GA(
ushort entity_ls8 = entity_ls.s7;
ushort entity_ls9 = entity_ls.s8;
/*
write_channel_altera(chan_GA2LS_LS1_energy, LocalEneNext[entity_ls1]);
write_channel_altera(chan_GA2LS_LS2_energy, LocalEneNext[entity_ls2]);
write_channel_altera(chan_GA2LS_LS3_energy, LocalEneNext[entity_ls3]);
write_channel_altera(chan_GA2LS_LS4_energy, LocalEneNext[entity_ls4]);
write_channel_altera(chan_GA2LS_LS5_energy, LocalEneNext[entity_ls5]);
write_channel_altera(chan_GA2LS_LS6_energy, LocalEneNext[entity_ls6]);
write_channel_altera(chan_GA2LS_LS7_energy, LocalEneNext[entity_ls7]);
write_channel_altera(chan_GA2LS_LS8_energy, LocalEneNext[entity_ls8]);
write_channel_altera(chan_GA2LS_LS9_energy, LocalEneNext[entity_ls9]);
*/
write_pipe_block(chan_GA2LS_LS1_energy, &LocalEneNext[entity_ls1]);
write_pipe_block(chan_GA2LS_LS2_energy, &LocalEneNext[entity_ls2]);
write_pipe_block(chan_GA2LS_LS3_energy, &LocalEneNext[entity_ls3]);
......@@ -994,17 +965,6 @@ void Krnl_GA(
__attribute__((xcl_pipeline_loop))
LOOP_GA_LS_INNER_WRITE_GENOTYPE:
for (uchar gene_cnt=0; gene_cnt<DockConst_num_of_genes; gene_cnt++) {
/*
write_channel_altera(chan_GA2LS_LS1_genotype, LocalPopNext[entity_ls1][gene_cnt & MASK_GENOTYPE]);
write_channel_altera(chan_GA2LS_LS2_genotype, LocalPopNext[entity_ls2][gene_cnt & MASK_GENOTYPE]);
write_channel_altera(chan_GA2LS_LS3_genotype, LocalPopNext[entity_ls3][gene_cnt & MASK_GENOTYPE]);
write_channel_altera(chan_GA2LS_LS4_genotype, LocalPopNext[entity_ls4][gene_cnt & MASK_GENOTYPE]);
write_channel_altera(chan_GA2LS_LS5_genotype, LocalPopNext[entity_ls5][gene_cnt & MASK_GENOTYPE]);
write_channel_altera(chan_GA2LS_LS6_genotype, LocalPopNext[entity_ls6][gene_cnt & MASK_GENOTYPE]);
write_channel_altera(chan_GA2LS_LS7_genotype, LocalPopNext[entity_ls7][gene_cnt & MASK_GENOTYPE]);
write_channel_altera(chan_GA2LS_LS8_genotype, LocalPopNext[entity_ls8][gene_cnt & MASK_GENOTYPE]);
write_channel_altera(chan_GA2LS_LS9_genotype, LocalPopNext[entity_ls9][gene_cnt & MASK_GENOTYPE]);
*/
write_pipe_block(chan_GA2LS_LS1_genotype, &LocalPopNext[entity_ls1][gene_cnt & MASK_GENOTYPE]);
write_pipe_block(chan_GA2LS_LS2_genotype, &LocalPopNext[entity_ls2][gene_cnt & MASK_GENOTYPE]);
write_pipe_block(chan_GA2LS_LS3_genotype, &LocalPopNext[entity_ls3][gene_cnt & MASK_GENOTYPE]);
......@@ -1258,37 +1218,6 @@ void Krnl_GA(
// ------------------------------------------------------------------
// Turn off PRNG kernels
/*
write_channel_altera(chan_Arbiter_BT_ushort_float_off, false);
write_channel_altera(chan_Arbiter_GG_uchar_off, false);
write_channel_altera(chan_Arbiter_GG_float_off, false);
write_channel_altera(chan_Arbiter_LS123_ushort_off, false);
write_channel_altera(chan_Arbiter_LS_float_off, false);
write_channel_altera(chan_Arbiter_LS2_float_off, false);
write_channel_altera(chan_Arbiter_LS3_float_off, false);
write_channel_altera(chan_Arbiter_LS4_float_off, false);
write_channel_altera(chan_Arbiter_LS5_float_off, false);
write_channel_altera(chan_Arbiter_LS6_float_off, false);
write_channel_altera(chan_Arbiter_LS7_float_off, false);
write_channel_altera(chan_Arbiter_LS8_float_off, false);
write_channel_altera(chan_Arbiter_LS9_float_off, false);
*/
/*
const bool tmp_bool_false = false;
write_pipe_block(chan_Arbiter_BT_ushort_float_off, &tmp_bool_false);
write_pipe_block(chan_Arbiter_GG_uchar_off, &tmp_bool_false);
write_pipe_block(chan_Arbiter_GG_float_off, &tmp_bool_false);
write_pipe_block(chan_Arbiter_LS123_ushort_off, &tmp_bool_false);
write_pipe_block(chan_Arbiter_LS_float_off, &tmp_bool_false);
write_pipe_block(chan_Arbiter_LS2_float_off, &tmp_bool_false);
write_pipe_block(chan_Arbiter_LS3_float_off, &tmp_bool_false);
write_pipe_block(chan_Arbiter_LS4_float_off, &tmp_bool_false);
write_pipe_block(chan_Arbiter_LS5_float_off, &tmp_bool_false);
write_pipe_block(chan_Arbiter_LS6_float_off, &tmp_bool_false);
write_pipe_block(chan_Arbiter_LS7_float_off, &tmp_bool_false);
write_pipe_block(chan_Arbiter_LS8_float_off, &tmp_bool_false);
write_pipe_block(chan_Arbiter_LS9_float_off, &tmp_bool_false);
*/
const int tmp_int_one = 1;
write_pipe_block(chan_Arbiter_BT_ushort_float_off, &tmp_int_one);
write_pipe_block(chan_Arbiter_GG_uchar_off, &tmp_int_one);
......@@ -1308,28 +1237,6 @@ void Krnl_GA(
*/
// Turn off LS kernels
/*
write_channel_altera(chan_GA2LS_Off1_active, false);
write_channel_altera(chan_GA2LS_Off2_active, false);
write_channel_altera(chan_GA2LS_Off3_active, false);
write_channel_altera(chan_GA2LS_Off4_active, false);
write_channel_altera(chan_GA2LS_Off5_active, false);
write_channel_altera(chan_GA2LS_Off6_active, false);
write_channel_altera(chan_GA2LS_Off7_active, false);
write_channel_altera(chan_GA2LS_Off8_active, false);
write_channel_altera(chan_GA2LS_Off9_active, false);
*/
/*
write_pipe_block(chan_GA2LS_Off1_active, &tmp_bool_false);
write_pipe_block(chan_GA2LS_Off2_active, &tmp_bool_false);
write_pipe_block(chan_GA2LS_Off3_active, &tmp_bool_false);
write_pipe_block(chan_GA2LS_Off4_active, &tmp_bool_false);
write_pipe_block(chan_GA2LS_Off5_active, &tmp_bool_false);
write_pipe_block(chan_GA2LS_Off6_active, &tmp_bool_false);
write_pipe_block(chan_GA2LS_Off7_active, &tmp_bool_false);
write_pipe_block(chan_GA2LS_Off8_active, &tmp_bool_false);
write_pipe_block(chan_GA2LS_Off9_active, &tmp_bool_false);
*/
write_pipe_block(chan_GA2LS_Off1_active, &tmp_int_one);
write_pipe_block(chan_GA2LS_Off2_active, &tmp_int_one);
write_pipe_block(chan_GA2LS_Off3_active, &tmp_int_one);
......@@ -1344,12 +1251,6 @@ void Krnl_GA(
*/
// Turn off IGL_Arbiter, Conform, InterE, IntraE kernerls
/*
write_channel_altera(chan_IGLArbiter_Off, false);
*/
/*
write_pipe_block(chan_IGLArbiter_Off, &tmp_bool_false);
*/
write_pipe_block(chan_IGLArbiter_Off, &tmp_int_one);
/*
mem_fence(CLK_CHANNEL_MEM_FENCE);
......
......@@ -1378,17 +1378,6 @@ while(active) {
__attribute__((xcl_pipeline_loop))
LOOP_FOR_IGL_WRITE_MODE:
for (uchar j=0; j<bound; j++) {
#if 0
/*
char mode_tmp = Off_valid? 0x00: IC_valid? 'I': GG_valid? 'G': mode[j];
*/
char mode_tmp = (Off_valid == 0)? 0x00: (IC_valid == 0)? 'I': (GG_valid == 0)? 'G': mode[j];
char2 actmode = {active, mode_tmp};
/*
write_channel_altera(chan_IGL2Conform_actmode, actmode);
*/
write_pipe_block(chan_IGL2Conform_actmode, &actmode);
#endif
char mode_tmp = (Off_valid == 0)? 0x00: (IC_valid == 0)? 'I': (GG_valid == 0)? 'G': mode[j];
write_pipe_block(chan_IGL2Conform_actmode, &mode_tmp);
......
......@@ -199,9 +199,6 @@ void Krnl_IGL_Arbiter(/*unsigned char DockConst_num_of_genes*/
}
if (enable_write_channel == true) {
/*
write_channel_intel(chan_IGL2Conform_actmode, mode_tmp);
*/
write_pipe_block(chan_IGL2Conform_actmode, &mode_tmp);
}
} // End for (uchar j=0; j<9; j++)
......
......@@ -479,19 +479,6 @@ while(active) {
#endif
switch (mode) {
/*
case 'I': write_channel_altera(chan_Intere2StoreIC_intere, final_interE); break;
case 'G': write_channel_altera(chan_Intere2StoreGG_intere, final_interE); break;
case 0x01: write_channel_altera(chan_Intere2StoreLS_LS1_intere, final_interE); break;
case 0x02: write_channel_altera(chan_Intere2StoreLS_LS2_intere, final_interE); break;
case 0x03: write_channel_altera(chan_Intere2StoreLS_LS3_intere, final_interE); break;
case 0x04: write_channel_altera(chan_Intere2StoreLS_LS4_intere, final_interE); break;
case 0x05: write_channel_altera(chan_Intere2StoreLS_LS5_intere, final_interE); break;
case 0x06: write_channel_altera(chan_Intere2StoreLS_LS6_intere, final_interE); break;
case 0x07: write_channel_altera(chan_Intere2StoreLS_LS7_intere, final_interE); break;
case 0x08: write_channel_altera(chan_Intere2StoreLS_LS8_intere, final_interE); break;
case 0x09: write_channel_altera(chan_Intere2StoreLS_LS9_intere, final_interE); break;
*/
case 'I': write_pipe_block(chan_Intere2StoreIC_intere, &final_interE); break;
case 'G': write_pipe_block(chan_Intere2StoreGG_intere, &final_interE); break;
case 0x01: write_pipe_block(chan_Intere2StoreLS_LS1_intere, &final_interE); break;
......
......@@ -283,19 +283,6 @@ while(active) {
// Send intramolecular energy to channel
// --------------------------------------------------------------
switch (mode) {
/*
case 'I': write_channel_altera(chan_Intrae2StoreIC_intrae, intraE); break;
case 'G': write_channel_altera(chan_Intrae2StoreGG_intrae, intraE); break;
case 0x01: write_channel_altera(chan_Intrae2StoreLS_LS1_intrae, intraE); break;
case 0x02: write_channel_altera(chan_Intrae2StoreLS_LS2_intrae, intraE); break;
case 0x03: write_channel_altera(chan_Intrae2StoreLS_LS3_intrae, intraE); break;
case 0x04: write_channel_altera(chan_Intrae2StoreLS_LS4_intrae, intraE); break;
case 0x05: write_channel_altera(chan_Intrae2StoreLS_LS5_intrae, intraE); break;
case 0x06: write_channel_altera(chan_Intrae2StoreLS_LS6_intrae, intraE); break;
case 0x07: write_channel_altera(chan_Intrae2StoreLS_LS7_intrae, intraE); break;
case 0x08: write_channel_altera(chan_Intrae2StoreLS_LS8_intrae, intraE); break;
case 0x09: write_channel_altera(chan_Intrae2StoreLS_LS9_intrae, intraE); break;
*/
case 'I': write_pipe_block(chan_Intrae2StoreIC_intrae, &intraE); break;
case 'G': write_pipe_block(chan_Intrae2StoreGG_intrae, &intraE); break;
case 0x01: write_pipe_block(chan_Intrae2StoreLS_LS1_intrae, &intraE); break;
......
......@@ -174,23 +174,9 @@ while(valid) {
// Not completely strict as the (iteration_cnt < DockConst_max_num_of_iters) is ignored
// In practice, rho condition dominates most of the cases
#if defined (FIXED_POINT_LS1)
/*
write_channel_altera(chan_LS2Arbiter_LS1_end, (fixpt_rho < DockConst_rho_lower_bound)?true:false);
*/
/*
bool tmp_bool = (fixpt_rho < DockConst_rho_lower_bound)?true:false;
write_pipe_block(chan_LS2Arbiter_LS1_end, &tmp_bool);
*/
int tmp_int = (fixpt_rho < DockConst_rho_lower_bound)?0:1;
write_pipe_block(chan_LS2Arbiter_LS1_end, &tmp_int);
#else
/*
write_channel_altera(chan_LS2Arbiter_LS1_end, (rho < DockConst_rho_lower_bound)?true:false);
*/
/*
bool tmp_bool = (rho < DockConst_rho_lower_bound)?true:false;
write_pipe_block(chan_LS2Arbiter_LS1_end, &tmp_bool);
*/
int tmp_int = (rho < DockConst_rho_lower_bound)?0:1;
write_pipe_block(chan_LS2Arbiter_LS1_end, &tmp_int);
#endif
......@@ -239,9 +225,7 @@ while(valid) {
else { fixpt_tmp3 = fixedpt_map_angle_360(fixpt_tmp3); }}
entity_possible_new_genotype [i] = fixpt_tmp3;
/*
write_channel_altera(chan_LS2Conf_LS1_genotype, fixedpt_tofloat(fixpt_tmp3));
*/
float tmp_float = fixedpt_tofloat(fixpt_tmp3);
write_pipe_block(chan_LS2Conf_LS1_genotype, &tmp_float);
......@@ -269,9 +253,6 @@ while(valid) {
else { tmp3 = map_angle_360(tmp3); }}
entity_possible_new_genotype [i] = tmp3;
/*
write_channel_altera(chan_LS2Conf_LS1_genotype, tmp3);
*/
write_pipe_block(chan_LS2Conf_LS1_genotype, &tmp3);
#endif
......@@ -404,9 +385,6 @@ while(valid) {
for (uchar i=0; i<DockConst_num_of_genes; i++) {
if (i == 0) {
float2 evalenergy = {*(float*)&LS_eval, current_energy};
/*
write_channel_altera(chan_LS2GA_LS1_evalenergy, evalenergy);
*/
write_pipe_block(chan_LS2GA_LS1_evalenergy, &evalenergy);
}
/*
......@@ -414,15 +392,9 @@ while(valid) {
*/
#if defined (FIXED_POINT_LS1)
/*
write_channel_altera(chan_LS2GA_LS1_genotype, fixedpt_tofloat(genotype [i]));
*/
float tmp_float = fixedpt_tofloat(genotype [i]);
write_pipe_block(chan_LS2GA_LS1_genotype, &tmp_float);
#else
/*
write_channel_altera(chan_LS2GA_LS1_genotype, genotype [i]);
*/
write_pipe_block(chan_LS2GA_LS1_genotype, &genotype [i]);
#endif
}
......
......@@ -176,23 +176,9 @@ while(valid) {
// Not completely strict as the (iteration_cnt < DockConst_max_num_of_iters) is ignored
// In practice, rho condition dominates most of the cases
#if defined (FIXED_POINT_LS2)
/*
write_channel_altera(chan_LS2Arbiter_LS2_end, (fixpt_rho < DockConst_rho_lower_bound)?true:false);
*/
/*
bool tmp_bool = (fixpt_rho < DockConst_rho_lower_bound)?true:false;
write_pipe_block(chan_LS2Arbiter_LS2_end, &tmp_bool);
*/
int tmp_int = (fixpt_rho < DockConst_rho_lower_bound)?0:1;
write_pipe_block(chan_LS2Arbiter_LS2_end, &tmp_int);
#else
/*
write_channel_altera(chan_LS2Arbiter_LS2_end, (rho < DockConst_rho_lower_bound)?true:false);
*/
/*
bool tmp_bool = (rho < DockConst_rho_lower_bound)?true:false;
write_pipe_block(chan_LS2Arbiter_LS2_end, &tmp_bool);
*/
int tmp_int = (rho < DockConst_rho_lower_bound)?0:1;
write_pipe_block(chan_LS2Arbiter_LS2_end, &tmp_int);
#endif
......@@ -241,9 +227,6 @@ while(valid) {
else { fixpt_tmp3 = fixedpt_map_angle_360(fixpt_tmp3);}}
entity_possible_new_genotype [i] = fixpt_tmp3;
/*
write_channel_altera(chan_LS2Conf_LS2_genotype, fixedpt_tofloat(fixpt_tmp3));
*/
float tmp_float = fixedpt_tofloat(fixpt_tmp3);
write_pipe_block(chan_LS2Conf_LS2_genotype, &tmp_float);
......@@ -271,9 +254,6 @@ while(valid) {
else { tmp3 = map_angle_360(tmp3);}}
entity_possible_new_genotype [i] = tmp3;
/*
write_channel_altera(chan_LS2Conf_LS2_genotype, tmp3);
*/
write_pipe_block(chan_LS2Conf_LS2_genotype, &tmp3);
#endif
......@@ -410,9 +390,6 @@ while(valid) {
for (uchar i=0; i<DockConst_num_of_genes; i++) {
if (i == 0) {
float2 evalenergy = {*(float*)&LS_eval, current_energy};
/*
write_channel_altera(chan_LS2GA_LS2_evalenergy, evalenergy);
*/
write_pipe_block(chan_LS2GA_LS2_evalenergy, &evalenergy);
}
/*
......@@ -420,15 +397,9 @@ while(valid) {
*/
#if defined (FIXED_POINT_LS2)
/*
write_channel_altera(chan_LS2GA_LS2_genotype, fixedpt_tofloat(genotype [i]));
*/
float tmp_float = fixedpt_tofloat(genotype [i]);
write_pipe_block(chan_LS2GA_LS2_genotype, &tmp_float);
#else
/*
write_channel_altera(chan_LS2GA_LS2_genotype, genotype [i]);
*/
write_pipe_block(chan_LS2GA_LS2_genotype, &genotype [i]);
#endif
}
......
......@@ -177,23 +177,9 @@ while(valid) {
// Not completely strict as the (iteration_cnt < DockConst_max_num_of_iters) is ignored
// In practice, rho condition dominates most of the cases
#if defined (FIXED_POINT_LS3)
/*
write_channel_altera(chan_LS2Arbiter_LS3_end, (fixpt_rho < DockConst_rho_lower_bound)?true:false);
*/
/*
bool tmp_bool = (fixpt_rho < DockConst_rho_lower_bound)?true:false;
write_pipe_block(chan_LS2Arbiter_LS3_end, &tmp_bool);
*/
int tmp_int = (fixpt_rho < DockConst_rho_lower_bound)?0:1;
write_pipe_block(chan_LS2Arbiter_LS3_end, &tmp_int);
#else
/*
write_channel_altera(chan_LS2Arbiter_LS3_end, (rho < DockConst_rho_lower_bound)?true:false);
*/
/*
bool tmp_bool = (rho < DockConst_rho_lower_bound)?true:false;
write_pipe_block(chan_LS2Arbiter_LS3_end, &tmp_bool);
*/
int tmp_int = (rho < DockConst_rho_lower_bound)?0:1;
write_pipe_block(chan_LS2Arbiter_LS3_end, &tmp_int);
#endif
......@@ -242,9 +228,6 @@ while(valid) {
else { fixpt_tmp3 = fixedpt_map_angle_360(fixpt_tmp3); }}
entity_possible_new_genotype [i] = fixpt_tmp3;
/*
write_channel_altera(chan_LS2Conf_LS3_genotype, fixedpt_tofloat(fixpt_tmp3));
*/
float tmp_float = fixedpt_tofloat(fixpt_tmp3);
write_pipe_block(chan_LS2Conf_LS3_genotype, &tmp_float);
......@@ -272,9 +255,6 @@ while(valid) {
else { tmp3 = map_angle_360(tmp3);}}
entity_possible_new_genotype [i] = tmp3;
/*
write_channel_altera(chan_LS2Conf_LS3_genotype, tmp3);
*/
write_pipe_block(chan_LS2Conf_LS3_genotype, &tmp3);
#endif
......@@ -407,9 +387,6 @@ while(valid) {
for (uchar i=0; i<DockConst_num_of_genes; i++) {
if (i == 0) {
float2 evalenergy = {*(float*)&LS_eval, current_energy};
/*
write_channel_altera(chan_LS2GA_LS3_evalenergy, evalenergy);
*/
write_pipe_block(chan_LS2GA_LS3_evalenergy, &evalenergy);
}
/*
......@@ -417,15 +394,9 @@ while(valid) {
*/
#if defined (FIXED_POINT_LS3)
/*
write_channel_altera(chan_LS2GA_LS3_genotype, fixedpt_tofloat(genotype [i]));
*/
float tmp_float = fixedpt_tofloat(genotype [i]);
write_pipe_block(chan_LS2GA_LS3_genotype, &tmp_float);
#else
/*
write_channel_altera(chan_LS2GA_LS3_genotype, genotype [i]);
*/
write_pipe_block(chan_LS2GA_LS3_genotype, &genotype [i]);
#endif
}
......
......@@ -177,23 +177,9 @@ while(valid) {
// Not completely strict as the (iteration_cnt < DockConst_max_num_of_iters) is ignored
// In practice, rho condition dominates most of the cases
#if defined (FIXED_POINT_LS4)
/*
write_channel_altera(chan_LS2Arbiter_LS4_end, (fixpt_rho < DockConst_rho_lower_bound)?true:false);
*/
/*
bool tmp_bool = (fixpt_rho < DockConst_rho_lower_bound)?true:false;
write_pipe_block(chan_LS2Arbiter_LS4_end, &tmp_bool);
*/
int tmp_int = (fixpt_rho < DockConst_rho_lower_bound)?0:1;
write_pipe_block(chan_LS2Arbiter_LS4_end, &tmp_int);
#else
/*
write_channel_altera(chan_LS2Arbiter_LS4_end, (rho < DockConst_rho_lower_bound)?true:false);
*/
/*
bool tmp_bool = (rho < DockConst_rho_lower_bound)?true:false;
write_pipe_block(chan_LS2Arbiter_LS4_end, &tmp_bool);
*/
int tmp_int = (rho < DockConst_rho_lower_bound)?0:1;
write_pipe_block(chan_LS2Arbiter_LS4_end, &tmp_int);
#endif
......@@ -242,9 +228,6 @@ while(valid) {
else { fixpt_tmp3 = fixedpt_map_angle_360(fixpt_tmp3);}}
entity_possible_new_genotype [i] = fixpt_tmp3;
/*
write_channel_altera(chan_LS2Conf_LS4_genotype, fixedpt_tofloat(fixpt_tmp3));
*/
float tmp_float = fixedpt_tofloat(fixpt_tmp3);
write_pipe_block(chan_LS2Conf_LS4_genotype, &tmp_float);
......@@ -272,9 +255,6 @@ while(valid) {
else { tmp3 = map_angle_360(tmp3);}}
entity_possible_new_genotype [i] = tmp3;
/*
write_channel_altera(chan_LS2Conf_LS4_genotype, tmp3);
*/
write_pipe_block(chan_LS2Conf_LS4_genotype, &tmp3);
#endif
......@@ -406,9 +386,6 @@ while(valid) {
for (uchar i=0; i<DockConst_num_of_genes; i++) {
if (i == 0) {
float2 evalenergy = {*(float*)&LS_eval, current_energy};
/*
write_channel_altera(chan_LS2GA_LS4_evalenergy, evalenergy);
*/
write_pipe_block(chan_LS2GA_LS4_evalenergy, &evalenergy);
}
/*
......@@ -416,15 +393,9 @@ while(valid) {
*/
#if defined (FIXED_POINT_LS4)
/*
write_channel_altera(chan_LS2GA_LS4_genotype, fixedpt_tofloat(genotype [i]));
*/
float tmp_float = fixedpt_tofloat(genotype [i]);
write_pipe_block(chan_LS2GA_LS4_genotype, &tmp_float);
#else
/*
write_channel_altera(chan_LS2GA_LS4_genotype, genotype [i]);
*/
write_pipe_block(chan_LS2GA_LS4_genotype, &genotype [i]);
#endif
}
......
......@@ -177,23 +177,9 @@ while(valid) {
// Not completely strict as the (iteration_cnt < DockConst_max_num_of_iters) is ignored
// In practice, rho condition dominates most of the cases
#if defined (FIXED_POINT_LS5)
/*
write_channel_altera(chan_LS2Arbiter_LS5_end, (fixpt_rho < DockConst_rho_lower_bound)?true:false);
*/
/*
bool tmp_bool = (fixpt_rho < DockConst_rho_lower_bound)?true:false;
write_pipe_block(chan_LS2Arbiter_LS5_end, &tmp_bool);
*/
int tmp_int = (fixpt_rho < DockConst_rho_lower_bound)?0:1;
write_pipe_block(chan_LS2Arbiter_LS5_end, &tmp_int);
#else
/*
write_channel_altera(chan_LS2Arbiter_LS5_end, (rho < DockConst_rho_lower_bound)?true:false);
*/
/*
bool tmp_bool= (rho < DockConst_rho_lower_bound)?true:false;
write_pipe_block(chan_LS2Arbiter_LS5_end, &tmp_bool);
*/
int tmp_int = (rho < DockConst_rho_lower_bound)?0:1;
write_pipe_block(chan_LS2Arbiter_LS5_end, &tmp_int);
#endif
......@@ -241,9 +227,6 @@ while(valid) {
else { fixpt_tmp3 = fixedpt_map_angle_360(fixpt_tmp3);}}
entity_possible_new_genotype [i] = fixpt_tmp3;
/*
write_channel_altera(chan_LS2Conf_LS5_genotype, fixedpt_tofloat(fixpt_tmp3));
*/
float tmp_float = fixedpt_tofloat(fixpt_tmp3);
write_pipe_block(chan_LS2Conf_LS5_genotype, &tmp_float);
......@@ -271,9 +254,6 @@ while(valid) {
else { tmp3 = map_angle_360(tmp3);}}
entity_possible_new_genotype [i] = tmp3;
/*
write_channel_altera(chan_LS2Conf_LS5_genotype, tmp3);
*/
write_pipe_block(chan_LS2Conf_LS5_genotype, &tmp3);
#endif
......@@ -408,9 +388,6 @@ while(valid) {
for (uchar i=0; i<DockConst_num_of_genes; i++) {
if (i == 0) {
float2 evalenergy = {*(float*)&LS_eval, current_energy};
/*
write_channel_altera(chan_LS2GA_LS5_evalenergy, evalenergy);
*/
write_pipe_block(chan_LS2GA_LS5_evalenergy, &evalenergy);
}
/*
......@@ -418,15 +395,9 @@ while(valid) {
*/
#if defined (FIXED_POINT_LS5)
/*
write_channel_altera(chan_LS2GA_LS5_genotype, fixedpt_tofloat(genotype [i]));
*/
float tmp_float = fixedpt_tofloat(genotype [i]);
write_pipe_block(chan_LS2GA_LS5_genotype, &tmp_float);
#else
/*
write_channel_altera(chan_LS2GA_LS5_genotype, genotype [i]);
*/
write_pipe_block(chan_LS2GA_LS5_genotype, &genotype [i]);
#endif
}
......
......@@ -176,23 +176,9 @@ while(valid) {
// Not completely strict as the (iteration_cnt < DockConst_max_num_of_iters) is ignored
// In practice, rho condition dominates most of the cases
#if defined (FIXED_POINT_LS6)
/*
write_channel_altera(chan_LS2Arbiter_LS6_end, (fixpt_rho < DockConst_rho_lower_bound)?true:false);
*/
/*
bool tmp_bool = (fixpt_rho < DockConst_rho_lower_bound)?true:false;
write_pipe_block(chan_LS2Arbiter_LS6_end, &tmp_bool);
*/
int tmp_int = (fixpt_rho < DockConst_rho_lower_bound)?0:1;
write_pipe_block(chan_LS2Arbiter_LS6_end, &tmp_int);
#else
/*
write_channel_altera(chan_LS2Arbiter_LS6_end, (rho < DockConst_rho_lower_bound)?true:false);
*/
/*
bool tmp_bool = (rho < DockConst_rho_lower_bound)?true:false;
write_pipe_block(chan_LS2Arbiter_LS6_end, &tmp_bool);
*/
int tmp_int = (rho < DockConst_rho_lower_bound)?0:1;
write_pipe_block(chan_LS2Arbiter_LS6_end, &tmp_int);
#endif
......@@ -241,9 +227,6 @@ while(valid) {
else { fixpt_tmp3 = fixedpt_map_angle_360(fixpt_tmp3);}}
entity_possible_new_genotype [i] = fixpt_tmp3;