Commit 602a1a82 authored by Leonardo Solis's avatar Leonardo Solis
Browse files

minor cleanup in GA krnl


Former-commit-id: aca535e8
parent 9221cfe1
......@@ -481,13 +481,6 @@ fixedpt fixedpt_map_angle_360(fixedpt angle)
}
#endif
#if 0
// Shift register sizes
// Such registers are used to reduce Initiation Interval (II)
#define SHIFT_REG_SIZE 10
#define SHIFT_REG_SIZE_MINUS_ONE (SHIFT_REG_SIZE-1)
#endif
// --------------------------------------------------------------------------
// Lamarckian Genetic-Algorithm (GA): GA + LS (Local Search)
// Originally from: searchoptimum.c
......@@ -679,19 +672,6 @@ void Krnl_GA(
*/
float loc_energies[MAX_POPSIZE];
#if 0
// Shift register to reduce II (initially II=6) of best entity for-loop
float shift_reg[SHIFT_REG_SIZE];
/*
#pragma unroll
*/
__attribute__((opencl_unroll_hint))
LOOP_FOR_GA_SHIFT_INIT:
for (uchar i=0; i<SHIFT_REG_SIZE; i++) {
shift_reg[i] = 0.0f;
}
#endif
ushort best_entity = 0;
__attribute__((xcl_pipeline_loop))
......@@ -706,30 +686,6 @@ void Krnl_GA(
printf("%3u %20.6f\n", pop_cnt, loc_energies[pop_cnt]);
#endif
#if 0
// Identifying best entity
// The enclosing "if (pop_cnt>0) {}" should not be commented
// but it is removed in order to improve performance.
// It does not affect functionality as it performs
// an unnecessary evaluation when pop_cnt=0
//if (pop_cnt>0) {
shift_reg[SHIFT_REG_SIZE_MINUS_ONE] = loc_energies[best_entity];
/*
#pragma unroll
*/
__attribute__((opencl_unroll_hint))
LOOP_FOR_GA_SHIFT_MINUS_ONE:
for (uchar j=0; j<SHIFT_REG_SIZE_MINUS_ONE; j++) {
shift_reg[j] = shift_reg[j+1];
}
if (loc_energies[pop_cnt] < shift_reg[0]) {
best_entity = pop_cnt;
}
//}
#endif
if (loc_energies[pop_cnt] < loc_energies[best_entity]) {
best_entity = pop_cnt;
}
......
Supports Markdown
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