#28, removed unused refs to krnls 5,9,11,13,16,17,18,19

f63261aa · Leonardo Solis · 514726bc · f63261aa · f63261aa
Commit f63261aa authored Oct 30, 2018 by Leonardo Solis
--- a/common_xilinx/utility/boards.mk
+++ b/common_xilinx/utility/boards.mk
@@ -26,38 +26,22 @@ ENABLE_K3  = YES
 ENABLE_K4  = YES

 # Prng kernels
-
-# bt prng float
-ENABLE_K5  = NO
-
 ENABLE_K6  = YES
 ENABLE_K7  = YES

 # ls1 prng
-ENABLE_K9  = NO
-
 ENABLE_K10 = YES

 # Replace single Krnl_Prng_Arbiter
 # See kernels 31, 32, 33, 34
-ENABLE_K11 = NO

 # LS kernels
 ENABLE_K12 = YES

 # disable Krnl_LS_Arbiter
-ENABLE_K13 = NO
-
 ENABLE_K14 = YES
 ENABLE_K15 = YES

-# disable Krnl_LS2_Arbiter
-ENABLE_K16 = NO
-
-#ENABLE_K17 = YES
-#ENABLE_K18 = YES
-#ENABLE_K19 = YES
-
 ENABLE_K20 = YES
 ENABLE_K21 = YES

@@ -68,7 +52,7 @@ ENABLE_K22 = NO

 # PRNGS in GA for LS2 and LS3

-# ls2 & ls3 prng (ls1 is  K9)
+# ls2 & ls3 prng
 # replacement is K35
 ENABLE_K25 = NO
 ENABLE_K26 = NO
@@ -137,12 +121,6 @@ else
 	K4 =
 endif

-ifeq ($(ENABLE_K5),YES)
-	K5 =-DENABLE_KERNEL5
-else
-	K5 =
-endif
-
 ifeq ($(ENABLE_K6),YES)
 	K6 =-DENABLE_KERNEL6
 else
@@ -155,38 +133,18 @@ else
 	K7 =
 endif

-ifeq ($(ENABLE_K9),YES)
-	K9 =-DENABLE_KERNEL9
-else
-	K9 =
-endif
-
 ifeq ($(ENABLE_K10),YES)
 	K10 =-DENABLE_KERNEL10
 else
 	K10 =
 endif

-ifeq ($(ENABLE_K11),YES)
-	K11 =-DENABLE_KERNEL11
-else
-	K11 =
-endif
-
-
 ifeq ($(ENABLE_K12),YES)
 	K12 =-DENABLE_KERNEL12
 else
 	K12 =
 endif

-ifeq ($(ENABLE_K13),YES)
-	K13 =-DENABLE_KERNEL13
-else
-	K13 =
-endif
-
-
 ifeq ($(ENABLE_K14),YES)
 	K14 =-DENABLE_KERNEL14
 else
@@ -199,34 +157,6 @@ else
 	K15 =
 endif

-ifeq ($(ENABLE_K16),YES)
-	K16 =-DENABLE_KERNEL16
-else
-	K16 =
-endif
-
-ifeq ($(ENABLE_K17),YES)
-	K17 =-DENABLE_KERNEL17
-else
-	K17 =
-endif
-
-ifeq ($(ENABLE_K18),YES)
-	K18 =-DENABLE_KERNEL18
-else
-	K18 =
-endif
-
-ifeq ($(ENABLE_K19),YES)
-	K19 =-DENABLE_KERNEL19
-else
-	K19 =
-endif
-
-
-
-
-
 ifeq ($(ENABLE_K20),YES)
 	K20 =-DENABLE_KERNEL20
 else
@@ -414,8 +344,8 @@ ifeq ($(REPRO), YES)
 else	
 	REP=
 endif
-ENABLE_KERNELS = $(K1)  $(K2)  $(K3)  $(K4)  $(K5)  $(K6)  $(K7)         $(K9)  $(K10) \
-		 $(K11) $(K12) $(K13) $(K14) $(K15) $(K16) $(K17) $(K18) $(K19) $(K20) \
+ENABLE_KERNELS = $(K1)  $(K2)  $(K3)  $(K4)         $(K6)  $(K7)                $(K10) \
+		        $(K12)        $(K14) $(K15)                             $(K20) \
 		 $(K21) $(K22) $(K23) $(K24) $(K25) $(K26) $(K27) $(K28) $(K29) $(K30) \
 		 $(K31) $(K32) $(K33) $(K34) $(K35) $(K36) $(K37) $(K38) $(K39) $(K40) \
 		 $(K41) $(K42) $(K43) $(K44) $(K45) $(K46) $(K47) $(K48)

--- a/ofdock_taskpar_xl/host/src/performdocking.cpp
+++ b/ofdock_taskpar_xl/host/src/performdocking.cpp
@@ -65,14 +65,6 @@ static cl_kernel kernel4  = NULL;
 static const char *name_k4 = "Krnl_IntraE";
 #endif

-#if 0
-#ifdef ENABLE_KERNEL5
-static cl_command_queue command_queue5 = NULL;
-static cl_kernel kernel5  = NULL;
-static const char *name_k5 = "Krnl_Prng_BT_float";
-#endif
-#endif
-
 #ifdef ENABLE_KERNEL10
 static cl_command_queue command_queue10 = NULL;
 static cl_kernel kernel10  = NULL;
@@ -85,45 +77,18 @@ static cl_kernel kernel6  = NULL;
 static const char *name_k6 = "Krnl_Prng_GG_float";
 #endif

-#if 0
-#ifdef ENABLE_KERNEL9
-static cl_command_queue command_queue9 = NULL;
-static cl_kernel kernel9  = NULL;
-static const char *name_k9 = "Krnl_Prng_LS_ushort";
-#endif
-#endif
-
 #ifdef ENABLE_KERNEL7
 static cl_command_queue command_queue7 = NULL;
 static cl_kernel kernel7  = NULL;
 static const char *name_k7 = "Krnl_Prng_LS_float";
 #endif

-#if 0
-#ifdef ENABLE_KERNEL11
-static cl_command_queue command_queue11 = NULL;
-static cl_kernel kernel11  = NULL;
-static const char *name_k11 = "Krnl_Prng_Arbiter";
-#endif
-#endif
-
 #ifdef ENABLE_KERNEL12
 static cl_command_queue command_queue12 = NULL;
 static cl_kernel kernel12  = NULL;
 static const char *name_k12 = "Krnl_LS";
 #endif

-#if 0
-#ifdef ENABLE_KERNEL13
-static cl_command_queue command_queue13 = NULL;
-static cl_kernel kernel13  = NULL;
-static const char *name_k13 = "Krnl_LS_Arbiter";
-#endif
-#endif
-
-
-
-
 #ifdef ENABLE_KERNEL14
 static cl_command_queue command_queue14 = NULL;
 static cl_kernel kernel14  = NULL;
@@ -136,45 +101,6 @@ static cl_kernel kernel15  = NULL;
 static const char *name_k15 = "Krnl_LS2";
 #endif

-#if 0
-#ifdef ENABLE_KERNEL16
-static cl_command_queue command_queue16 = NULL;
-static cl_kernel kernel16  = NULL;
-static const char *name_k16 = "Krnl_LS2_Arbiter";
-#endif
-#endif
-
-#if 0
-#ifdef ENABLE_KERNEL17
-static cl_command_queue command_queue17 = NULL;
-static cl_kernel kernel17  = NULL;
-static const char *name_k17 = "Krnl_Conform2";
-#endif
-#endif
-
-#if 0
-#ifdef ENABLE_KERNEL18
-static cl_command_queue command_queue18 = NULL;
-static cl_kernel kernel18  = NULL;
-static const char *name_k18 = "Krnl_InterE2";
-#endif
-#endif
-
-#if 0
-#ifdef ENABLE_KERNEL19
-static cl_command_queue command_queue19 = NULL;
-static cl_kernel kernel19  = NULL;
-static const char *name_k19 = "Krnl_IntraE2";
-#endif
-#endif
-
-
-
-
-
-
-
-
 #ifdef ENABLE_KERNEL20
 static cl_command_queue command_queue20 = NULL;
 static cl_kernel kernel20  = NULL;
@@ -1193,12 +1119,6 @@ printf("%i %i\n", dockpars.num_of_intraE_contributors, myligand_reference.num_of
 	#endif
 #endif // End of ENABLE_KERNEL7

-#if 0
-#ifdef ENABLE_KERNEL9 // Krnl_PRNG_LS_ushort
-	setKernelArg(kernel9,1, sizeof(unsigned int),  &dockpars.pop_size);
-#endif // End of ENABLE_KERNEL9
-#endif
-
 #ifdef ENABLE_KERNEL10 // Krnl_PRNG_uchar
 	setKernelArg(kernel10,1, sizeof(unsigned char),  &dockpars.num_of_genes);

@@ -1249,12 +1169,6 @@ unsigned char  Host_cons_limit       = (unsigned char) dockpars.cons_limit;
 	#endif
 #endif // End of ENABLE_KERNEL12

-/*
-#ifdef ENABLE_KERNEL13 // Krnl_LS_Arbiter
-	setKernelArg(kernel13,0, sizeof(unsigned char),  &dockpars.num_of_genes);
-#endif // End of ENABLE_KERNEL12
-*/
-
 #ifdef ENABLE_KERNEL14 // Krnl_PRNG_LS2_float
 	setKernelArg(kernel14,1, sizeof(unsigned char),  &dockpars.num_of_genes);

@@ -1288,30 +1202,6 @@ unsigned char  Host_cons_limit       = (unsigned char) dockpars.cons_limit;
 	#endif
 #endif // End of ENABLE_KERNEL15

-/*
-#ifdef ENABLE_KERNEL16 // Krnl_LS2_Arbiter
-	setKernelArg(kernel16,0, sizeof(unsigned char),  &dockpars.num_of_genes);
-#endif // End of ENABLE_KERNEL12
-*/
-
-#if 0
-#ifdef ENABLE_KERNEL17 // Krnl_Conform2
-
-#endif // End of ENABLE_KERNEL17
-#endif
-
-#if 0
-#ifdef ENABLE_KERNEL18 // Krnl_InterE2
-
-#endif // End of ENABLE_KERNEL18
-#endif
-
-#if 0
-#ifdef ENABLE_KERNEL19 // Krnl_IntraE2
-
-#endif // End of ENABLE_KERNEL19
-#endif
-
 #ifdef ENABLE_KERNEL20 // Krnl_PRNG_LS3_float
 	setKernelArg(kernel20,1, sizeof(unsigned char),  &dockpars.num_of_genes);

@@ -1674,12 +1564,6 @@ unsigned char  Host_cons_limit       = (unsigned char) dockpars.cons_limit;
 	setKernelArg(kernel2,8,  sizeof(unsigned short), &run_cnt);
 #endif // End of ENABLE_KERNEL2

-#if 0
-	#ifdef ENABLE_KERNEL5 // Krnl_PRNG_BT_float
-			setKernelArg(kernel5,0, sizeof(unsigned int),  &cpu_prng_seeds[num_of_prng_blocks * run_cnt]);
-	#endif // End of ENABLE_KERNEL5
-#endif
-
 #ifdef ENABLE_KERNEL6 // Krnl_PRNG_GG_float
 		setKernelArg(kernel6,0, sizeof(unsigned int),   &cpu_prng_seeds[num_of_prng_blocks * run_cnt]);
 #endif // End of ENABLE_KERNEL6
@@ -1689,12 +1573,6 @@ unsigned char  Host_cons_limit       = (unsigned char) dockpars.cons_limit;
 		setKernelArg(kernel7,0, sizeof(unsigned int),   &cpu_prng_seeds[num_of_prng_blocks * run_cnt + 1]);
 #endif // End of ENABLE_KERNEL7

-#if 0
-	#ifdef ENABLE_KERNEL9 // Krnl_PRNG_LS_ushort
-			setKernelArg(kernel9,0, sizeof(unsigned int),   &cpu_prng_seeds[num_of_prng_blocks * run_cnt + 4]);
-	#endif // End of ENABLE_KERNEL9
-#endif
-
 #ifdef ENABLE_KERNEL10 // Krnl_Prng_GG_uchar
 		setKernelArg(kernel10,0, sizeof(unsigned int),   &cpu_prng_seeds[num_of_prng_blocks * run_cnt + 2]);
 #endif // End of ENABLE_KERNEL10
@@ -1703,12 +1581,6 @@ unsigned char  Host_cons_limit       = (unsigned char) dockpars.cons_limit;
 		setKernelArg(kernel14,0, sizeof(unsigned int),   &cpu_prng_seeds[num_of_prng_blocks * run_cnt + 3]);
 #endif // End of ENABLE_KERNEL7

-#if 0
-#ifdef ENABLE_KERNEL17 // Krnl_Conform2
-
-#endif // End of ENABLE_KERNEL17
-#endif
-
 #ifdef ENABLE_KERNEL20 // Krnl_PRNG_LS3_float
 		setKernelArg(kernel20,0, sizeof(unsigned int),   &cpu_prng_seeds[num_of_prng_blocks * run_cnt + 4]);
 #endif // End of ENABLE_KERNEL20
@@ -1785,12 +1657,6 @@ unsigned char  Host_cons_limit       = (unsigned char) dockpars.cons_limit;
 		runKernelTask(command_queue4,kernel4,NULL,NULL);
 		#endif // ENABLE_KERNEL4

-#if 0
-		#ifdef ENABLE_KERNEL5
-		runKernelTask(command_queue5,kernel5,NULL,NULL);
-		#endif // ENABLE_KERNEL5
-#endif
-
 		#ifdef ENABLE_KERNEL6
 		runKernelTask(command_queue6,kernel6,NULL,NULL);
 		#endif // ENABLE_KERNEL6
@@ -1799,32 +1665,14 @@ unsigned char  Host_cons_limit       = (unsigned char) dockpars.cons_limit;
 		runKernelTask(command_queue7,kernel7,NULL,NULL);
 		#endif // ENABLE_KERNEL7

-#if 0
-		#ifdef ENABLE_KERNEL9
-		runKernelTask(command_queue9,kernel9,NULL,NULL);
-		#endif // ENABLE_KERNEL9
-#endif
-
 		#ifdef ENABLE_KERNEL10
 		runKernelTask(command_queue10,kernel10,NULL,NULL);
 		#endif // ENABLE_KERNEL10

-#if 0
-		#ifdef ENABLE_KERNEL11
-		runKernelTask(command_queue11,kernel11,NULL,NULL);
-		#endif // ENABLE_KERNEL10
-#endif
-
 		#ifdef ENABLE_KERNEL12
 		runKernelTask(command_queue12,kernel12,NULL,NULL);
 		#endif // ENABLE_KERNEL12

-#if 0
-		#ifdef ENABLE_KERNEL13
-		runKernelTask(command_queue13,kernel13,NULL,NULL);
-		#endif // ENABLE_KERNEL13
-#endif
-
 		#ifdef ENABLE_KERNEL14
 		runKernelTask(command_queue14,kernel14,NULL,NULL);
 		#endif // ENABLE_KERNEL14
@@ -1833,30 +1681,6 @@ unsigned char  Host_cons_limit       = (unsigned char) dockpars.cons_limit;
 		runKernelTask(command_queue15,kernel15,NULL,NULL);
 		#endif // ENABLE_KERNEL14

-#if 0
-		#ifdef ENABLE_KERNEL16
-		runKernelTask(command_queue16,kernel16,NULL,NULL);
-		#endif // ENABLE_KERNEL16
-#endif
-
-#if 0
-		#ifdef ENABLE_KERNEL17
-		runKernelTask(command_queue17,kernel17,NULL,NULL);
-		#endif // ENABLE_KERNEL17
-#endif
-
-#if 0
-		#ifdef ENABLE_KERNEL18
-		runKernelTask(command_queue18,kernel18,NULL,NULL);
-		#endif // ENABLE_KERNEL18
-#endif
-
-#if 0
-		#ifdef ENABLE_KERNEL19
-		runKernelTask(command_queue19,kernel19,NULL,NULL);
-		#endif // ENABLE_KERNEL19
-#endif
-
 		#ifdef ENABLE_KERNEL20
 		runKernelTask(command_queue20,kernel20,NULL,NULL);
 		#endif // ENABLE_KERNEL20
@@ -2018,12 +1842,6 @@ unsigned char  Host_cons_limit       = (unsigned char) dockpars.cons_limit;
 		clFinish(command_queue4); 
 		#endif

-#if 0
-		#ifdef ENABLE_KERNEL5
-		clFinish(command_queue5); 
-		#endif
-#endif
-
 		#ifdef ENABLE_KERNEL6
 		clFinish(command_queue6); 
 		#endif
@@ -2032,32 +1850,14 @@ unsigned char  Host_cons_limit       = (unsigned char) dockpars.cons_limit;
 		clFinish(command_queue7);
 		#endif

-#if 0
-		#ifdef ENABLE_KERNEL9
-		clFinish(command_queue9);
-		#endif
-#endif
-
 		#ifdef ENABLE_KERNEL10
 		clFinish(command_queue10);
 		#endif

-#if 0
-		#ifdef ENABLE_KERNEL11
-		clFinish(command_queue11);
-		#endif
-#endif
-
 		#ifdef ENABLE_KERNEL12
 		clFinish(command_queue12);
 		#endif

-#if 0
-		#ifdef ENABLE_KERNEL13
-		clFinish(command_queue13);
-		#endif
-#endif
-
 		#ifdef ENABLE_KERNEL14
 		clFinish(command_queue14);
 		#endif
@@ -2066,30 +1866,6 @@ unsigned char  Host_cons_limit       = (unsigned char) dockpars.cons_limit;
 		clFinish(command_queue15);
 		#endif

-#if 0
-		#ifdef ENABLE_KERNEL16
-		clFinish(command_queue16);
-		#endif
-#endif
-
-#if 0
-		#ifdef ENABLE_KERNEL17
-		clFinish(command_queue17);
-		#endif
-#endif
-
-#if 0
-		#ifdef ENABLE_KERNEL18
-		clFinish(command_queue18);
-		#endif
-#endif
-
-#if 0
-		#ifdef ENABLE_KERNEL19
-		clFinish(command_queue19);
-		#endif
-#endif
-
 		#ifdef ENABLE_KERNEL20
 		clFinish(command_queue20);
 		#endif
@@ -2539,15 +2315,6 @@ bool init() {
  checkError(status, "Failed to create kernel");
 #endif

-#if 0
-#ifdef ENABLE_KERNEL5
-  command_queue5 = clCreateCommandQueue(context, device, 0, &status);
-  checkError(status, "Failed to create command queue5");
-  kernel5 = clCreateKernel(program, name_k5, &status);
-  checkError(status, "Failed to create kernel");
-#endif
-#endif
-
 #ifdef ENABLE_KERNEL6
  command_queue6 = clCreateCommandQueue(context, device, 0, &status);
  checkError(status, "Failed to create command queue6");
@@ -2562,15 +2329,6 @@ bool init() {
  checkError(status, "Failed to create kernel");
 #endif

-#if 0
-#ifdef ENABLE_KERNEL9
-  command_queue9 = clCreateCommandQueue(context, device, 0, &status);
-  checkError(status, "Failed to create command queue9");
-  kernel9 = clCreateKernel(program, name_k9, &status);
-  checkError(status, "Failed to create kernel");
-#endif
-#endif
-
 #ifdef ENABLE_KERNEL10
  command_queue10 = clCreateCommandQueue(context, device, 0, &status);
  checkError(status, "Failed to create command queue10");
@@ -2578,15 +2336,6 @@ bool init() {
  checkError(status, "Failed to create kernel");
 #endif

-#if 0
-#ifdef ENABLE_KERNEL11
-  command_queue11 = clCreateCommandQueue(context, device, 0, &status);
-  checkError(status, "Failed to create command queue10");
-  kernel11 = clCreateKernel(program, name_k11, &status);
-  checkError(status, "Failed to create kernel");
-#endif
-#endif
-
 #ifdef ENABLE_KERNEL12
  command_queue12 = clCreateCommandQueue(context, device, 0, &status);
  checkError(status, "Failed to create command queue12");
@@ -2594,15 +2343,6 @@ bool init() {
  checkError(status, "Failed to create kernel");
 #endif

-#if 0
-#ifdef ENABLE_KERNEL13
-  command_queue13 = clCreateCommandQueue(context, device, 0, &status);
-  checkError(status, "Failed to create command queue13");
-  kernel13 = clCreateKernel(program, name_k13, &status);
-  checkError(status, "Failed to create kernel");
-#endif
-#endif
-
 #ifdef ENABLE_KERNEL14
  command_queue14 = clCreateCommandQueue(context, device, 0, &status);
  checkError(status, "Failed to create command queue14");
@@ -2617,42 +2357,6 @@ bool init() {
  checkError(status, "Failed to create kernel");
 #endif

-#if 0
-#ifdef ENABLE_KERNEL16
-  command_queue16 = clCreateCommandQueue(context, device, 0, &status);
-  checkError(status, "Failed to create command queue13");
-  kernel16 = clCreateKernel(program, name_k16, &status);
-  checkError(status, "Failed to create kernel");
-#endif
-#endif
-
-#if 0
-#ifdef ENABLE_KERNEL17
-  command_queue17 = clCreateCommandQueue(context, device, 0, &status);
-  checkError(status, "Failed to create command queue17");
-  kernel17 = clCreateKernel(program, name_k17, &status);
-  checkError(status, "Failed to create kernel");
-#endif
-#endif
-
-#if 0
-#ifdef ENABLE_KERNEL18
-  command_queue18 = clCreateCommandQueue(context, device, 0, &status);
-  checkError(status, "Failed to create command queue18");
-  kernel18 = clCreateKernel(program, name_k18, &status);
-  checkError(status, "Failed to create kernel");
-#endif
-#endif
-
-#if 0
-#ifdef ENABLE_KERNEL19
-  command_queue19 = clCreateCommandQueue(context, device, 0, &status);
-  checkError(status, "Failed to create command queue19");
-  kernel19 = clCreateKernel(program, name_k19, &status);
-  checkError(status, "Failed to create kernel");
-#endif
-#endif
-
 #ifdef ENABLE_KERNEL20
  command_queue20 = clCreateCommandQueue(context, device, 0, &status);
  checkError(status, "Failed to create command queue20");
@@ -2907,13 +2611,6 @@ void cleanup() {
  if(command_queue4) {clReleaseCommandQueue(command_queue4);}
 #endif

-#if 0
-#ifdef ENABLE_KERNEL5
-  if(kernel5) {clReleaseKernel(kernel5);}
-  if(command_queue5) {clReleaseCommandQueue(command_queue5);}
-#endif
-#endif
-
 #ifdef ENABLE_KERNEL6
  if(kernel6) {clReleaseKernel(kernel6);}
  if(command_queue6) {clReleaseCommandQueue(command_queue6);}
@@ -2924,37 +2621,16 @@ void cleanup() {
  if(command_queue7) {clReleaseCommandQueue(command_queue7);}
 #endif

-#if 0
-#ifdef ENABLE_KERNEL9
-  if(kernel9) {clReleaseKernel(kernel9);}
-  if(command_queue9) {clReleaseCommandQueue(command_queue9);}
-#endif
-#endif
-
 #ifdef ENABLE_KERNEL10
  if(kernel10) {clReleaseKernel(kernel10);}
  if(command_queue10) {clReleaseCommandQueue(command_queue10);}
 #endif

-#if 0
-#ifdef ENABLE_KERNEL11
-  if(kernel11) {clReleaseKernel(kernel11);}
-  if(command_queue11) {clReleaseCommandQueue(command_queue11);}
-#endif
-#endif
-
 #ifdef ENABLE_KERNEL12