Commit b74215af authored by Leonardo Solis's avatar Leonardo Solis

reverted back to nb chan

parent f17d3edb
......@@ -44,7 +44,7 @@ channel char2 chan_Conf2Intrae_actmode;
channel char chan_Conf2Intrae_actmode;
// Send energy values from InterE & IntraE to genotype-senders (IC, GG, LSs)
#if 0
#if 1
channel float chan_Intere2StoreIC_intere __attribute__((depth(2)));
channel float chan_Intere2StoreGG_intere __attribute__((depth(2)));
#endif
......@@ -59,7 +59,7 @@ channel float chan_Intere2StoreLS_LS7_intere __attribute__((depth(2)));
channel float chan_Intere2StoreLS_LS8_intere __attribute__((depth(2)));
channel float chan_Intere2StoreLS_LS9_intere __attribute__((depth(2)));
#endif
#if 1
#if 0
channel float chan_Intere2StoreIC_intere __attribute__((depth(MAX_POPSIZE)));
channel float chan_Intere2StoreGG_intere __attribute__((depth(MAX_POPSIZE)));
#endif
......@@ -75,7 +75,7 @@ channel float chan_Intere2StoreLS_LS8_intere __attribute__((depth(MAX_POPSIZE))
channel float chan_Intere2StoreLS_LS9_intere __attribute__((depth(MAX_POPSIZE)));
#endif
#if 0
#if 1
channel float chan_Intrae2StoreIC_intrae __attribute__((depth(2)));
channel float chan_Intrae2StoreGG_intrae __attribute__((depth(2)));
#endif
......@@ -90,8 +90,7 @@ channel float chan_Intrae2StoreLS_LS7_intrae __attribute__((depth(2)));
channel float chan_Intrae2StoreLS_LS8_intrae __attribute__((depth(2)));
channel float chan_Intrae2StoreLS_LS9_intrae __attribute__((depth(2)));
#endif
#if 1
#if 0
channel float chan_Intrae2StoreIC_intrae __attribute__((depth(MAX_POPSIZE)));
channel float chan_Intrae2StoreGG_intrae __attribute__((depth(MAX_POPSIZE)));
#endif
......@@ -385,6 +384,7 @@ void Krnl_GA(__global float* restrict GlobPopulationCurrent,
write_channel_altera(chan_IC2Conf_genotype, LocalPopCurr[pop_cnt][pipe_cnt & MASK_GENOTYPE]);
#endif
#if 1
float tmp_ic;
#if defined(SINGLE_COPY_POP_ENE)
tmp_ic = GlobPopCurr[pop_cnt*ACTUAL_GENOTYPE_LENGTH + pipe_cnt];
......@@ -394,6 +394,7 @@ void Krnl_GA(__global float* restrict GlobPopulationCurrent,
LocalPopCurr[pop_cnt][pipe_cnt & MASK_GENOTYPE] = tmp_ic;
write_channel_altera(chan_IC2Conf_genotype, tmp_ic);
#endif
}
#if defined (DEBUG_KRNL_IC)
......@@ -401,7 +402,7 @@ void Krnl_GA(__global float* restrict GlobPopulationCurrent,
#endif
// Read energy
#if 0
#if 1
float energyIA_IC_rx;
float energyIE_IC_rx;
bool intra_valid = false;
......@@ -416,7 +417,7 @@ void Krnl_GA(__global float* restrict GlobPopulationCurrent,
}
#endif
#if 1
#if 0
mem_fence(CLK_CHANNEL_MEM_FENCE);
float energyIA_IC_rx = read_channel_altera(chan_Intrae2StoreIC_intrae);
mem_fence(CLK_CHANNEL_MEM_FENCE);
......@@ -644,7 +645,7 @@ void Krnl_GA(__global float* restrict GlobPopulationCurrent,
#endif
// Read energy
#if 0
#if 1
float energyIA_GG_rx;
float energyIE_GG_rx;
bool intra_valid = false;
......@@ -659,7 +660,7 @@ void Krnl_GA(__global float* restrict GlobPopulationCurrent,
}
#endif
#if 1
#if 0
mem_fence(CLK_CHANNEL_MEM_FENCE);
float energyIA_GG_rx = read_channel_altera(chan_Intrae2StoreGG_intrae);
mem_fence(CLK_CHANNEL_MEM_FENCE);
......
......@@ -209,8 +209,8 @@ while(valid) {
#if 0
mem_fence(CLK_CHANNEL_MEM_FENCE);
float energyIA_LS_rx = read_channel_altera(chan_Intrae2StoreLS_LS1_intrae);
float energyIE_LS_rx = read_channel_altera(chan_Intere2StoreLS_LS1_intere);
mem_fence(CLK_CHANNEL_MEM_FENCE);
float energyIE_LS_rx = read_channel_altera(chan_Intere2StoreLS_LS1_intere);
#endif
float candidate_energy = energyIA_LS_rx + energyIE_LS_rx;
......
......@@ -212,8 +212,8 @@ while(valid) {
#if 0
mem_fence(CLK_CHANNEL_MEM_FENCE);
float energyIA_LS_rx = read_channel_altera(chan_Intrae2StoreLS_LS2_intrae);
float energyIE_LS_rx = read_channel_altera(chan_Intere2StoreLS_LS2_intere);
mem_fence(CLK_CHANNEL_MEM_FENCE);
float energyIE_LS_rx = read_channel_altera(chan_Intere2StoreLS_LS2_intere);
#endif
float candidate_energy = energyIA_LS_rx + energyIE_LS_rx;
......
......@@ -212,8 +212,8 @@ while(valid) {
#if 0
mem_fence(CLK_CHANNEL_MEM_FENCE);
float energyIA_LS_rx = read_channel_altera(chan_Intrae2StoreLS_LS3_intrae);
float energyIE_LS_rx = read_channel_altera(chan_Intere2StoreLS_LS3_intere);
mem_fence(CLK_CHANNEL_MEM_FENCE);
float energyIE_LS_rx = read_channel_altera(chan_Intere2StoreLS_LS3_intere);
#endif
float candidate_energy = energyIA_LS_rx + energyIE_LS_rx;
......
......@@ -212,8 +212,8 @@ while(valid) {
#if 0
mem_fence(CLK_CHANNEL_MEM_FENCE);
float energyIA_LS_rx = read_channel_altera(chan_Intrae2StoreLS_LS4_intrae);
float energyIE_LS_rx = read_channel_altera(chan_Intere2StoreLS_LS4_intere);
mem_fence(CLK_CHANNEL_MEM_FENCE);
float energyIE_LS_rx = read_channel_altera(chan_Intere2StoreLS_LS4_intere);
#endif
float candidate_energy = energyIA_LS_rx + energyIE_LS_rx;
......
......@@ -212,8 +212,8 @@ while(valid) {
#if 0
mem_fence(CLK_CHANNEL_MEM_FENCE);
float energyIA_LS_rx = read_channel_altera(chan_Intrae2StoreLS_LS5_intrae);
float energyIE_LS_rx = read_channel_altera(chan_Intere2StoreLS_LS5_intere);
mem_fence(CLK_CHANNEL_MEM_FENCE);
float energyIE_LS_rx = read_channel_altera(chan_Intere2StoreLS_LS5_intere);
#endif
float candidate_energy = energyIA_LS_rx + energyIE_LS_rx;
......
......@@ -212,8 +212,8 @@ while(valid) {
#if 0
mem_fence(CLK_CHANNEL_MEM_FENCE);
float energyIA_LS_rx = read_channel_altera(chan_Intrae2StoreLS_LS6_intrae);
float energyIE_LS_rx = read_channel_altera(chan_Intere2StoreLS_LS6_intere);
mem_fence(CLK_CHANNEL_MEM_FENCE);
float energyIE_LS_rx = read_channel_altera(chan_Intere2StoreLS_LS6_intere);
#endif
float candidate_energy = energyIA_LS_rx + energyIE_LS_rx;
......
......@@ -212,8 +212,8 @@ while(valid) {
#if 0
mem_fence(CLK_CHANNEL_MEM_FENCE);
float energyIA_LS_rx = read_channel_altera(chan_Intrae2StoreLS_LS7_intrae);
float energyIE_LS_rx = read_channel_altera(chan_Intere2StoreLS_LS7_intere);
mem_fence(CLK_CHANNEL_MEM_FENCE);
float energyIE_LS_rx = read_channel_altera(chan_Intere2StoreLS_LS7_intere);
#endif
float candidate_energy = energyIA_LS_rx + energyIE_LS_rx;
......
......@@ -212,8 +212,8 @@ while(valid) {
#if 0
mem_fence(CLK_CHANNEL_MEM_FENCE);
float energyIA_LS_rx = read_channel_altera(chan_Intrae2StoreLS_LS8_intrae);
float energyIE_LS_rx = read_channel_altera(chan_Intere2StoreLS_LS8_intere);
mem_fence(CLK_CHANNEL_MEM_FENCE);
float energyIE_LS_rx = read_channel_altera(chan_Intere2StoreLS_LS8_intere);
#endif
float candidate_energy = energyIA_LS_rx + energyIE_LS_rx;
......
......@@ -212,8 +212,8 @@ while(valid) {
#if 0
mem_fence(CLK_CHANNEL_MEM_FENCE);
float energyIA_LS_rx = read_channel_altera(chan_Intrae2StoreLS_LS9_intrae);
float energyIE_LS_rx = read_channel_altera(chan_Intere2StoreLS_LS9_intere);
mem_fence(CLK_CHANNEL_MEM_FENCE);
float energyIE_LS_rx = read_channel_altera(chan_Intere2StoreLS_LS9_intere);
#endif
float candidate_energy = energyIA_LS_rx + energyIE_LS_rx;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment