Restored optimization

Restored all the benchmarks to gcc -O3 level of optimization, since for
debugging purpouses during the development I disabled some optimizations

opencl/backprop/Makefile

@@ -2,17 +2,17 @@ include ../../common/make.config
 
 # C compiler
 CC = g++
-CC_FLAGS = -g -O2 
+CC_FLAGS = -g -O3 
 
 backprop: backprop.o imagenet.o facetrain.o
 	$(CC) $(CC_FLAGS) backprop_ocl.cpp backprop.o imagenet.o facetrain.o -o backprop -I$(OPENCL_INC) -L$(OPENCL_LIB) -lOpenCL
 
 %.o: %.[ch]
 	$(CC) $(CC_FLAGS) $< -c
-	
-backprop.o: backprop.c 
+
+backprop.o: backprop.c
 	$(CC) $(CC_FLAGS) backprop.c -c
-	
+
 facetrain.o: facetrain.c
 	$(CC) $(CC_FLAGS) facetrain.c -c
 

opencl/dwt2d/Makefile

@@ -12,14 +12,14 @@ endif
 
 OUTPUT = -DOUTPUT
 
-C_C = g++
+C_C = g++ -O3
 OCL_LIB = -lOpenCL
-OCL_INC = -I/usr/local/cuda-5.5/include 
+OCL_INC = -I/usr/local/cuda-5.5/include
 
 default:	dwt2d
 
 components:
-	$(C_C) -o components.o $(OCL_INC) -c components.cpp 
+	$(C_C) -o components.o $(OCL_INC) -c components.cpp
 
 dwt2d:
 	$(C_C) -o dwt2d $(OCL_INC) \
@@ -28,7 +28,6 @@ dwt2d:
 		$(OUTPUT) \
 		$(OCL_LIB)
 
-clean:	
+clean:
 	rm -rf *.o dwt2d
 	rm *.bmp.dwt.*
-

opencl/hybridsort/Makefile

@@ -1,6 +1,6 @@
 include ../../common/make.config
 CC = gcc
-CC_FLAGS = -std=c99
+CC_FLAGS = -std=c99 -O3
 
 ifdef VERIFY
 override VERIFY = -DVERIFY

opencl/kmeans/Makefile

@@ -1,7 +1,7 @@
 include ../../common/make.config
 # C compiler
 CC = g++
-CC_FLAGS = -g -O2 
+CC_FLAGS = -g -O3
 
 kmeans: cluster.o getopt.o read_input.o kmeans_clustering.o rmse.o
 	$(CC) $(KERNEL_DIM) $(CC_FLAGS) -lOpenCL kmeans.cpp cluster.o getopt.o read_input.o kmeans_clustering.o rmse.o -o kmeans -I$(OPENCL_INC) -I$(OPENCL_DIR)/shared/inc/ -L$(OPENCL_LIB)
@@ -9,13 +9,13 @@ kmeans: cluster.o getopt.o read_input.o kmeans_clustering.o rmse.o
 %.o: %.[ch]
 	$(CC) $(CC_FLAGS) $< -c
 
-cluster.o: cluster.c 
+cluster.o: cluster.c
 	$(CC) $(CC_FLAGS) cluster.c -c
 
-getopt.o: getopt.c 
+getopt.o: getopt.c
 	$(CC) $(CC_FLAGS) getopt.c -c
 
-kmeans.o: kmeans.c 
+kmeans.o: kmeans.c
 	$(CC) $(CC_FLAGS) read_input.c -c
 
 rmse.o: rmse.c

opencl/particlefilter/Makefile

@@ -3,20 +3,20 @@ include ../../common/make.config
 
 # C compiler
 CC = g++
-CC_FLAGS = -O2 
+CC_FLAGS = -O3
 #INCLUDES = -I$(OPENCL_DIR)/OpenCL/common/inc -I$(OPENCL_DIR)/shared/inc/
 INCLUDES = -I$(OPENCL_INC)
 
 ALL: OCL_particlefilter_naive OCL_particlefilter_double OCL_particlefilter_single
 
 OCL_particlefilter_naive: ex_particle_OCL_naive_seq.o
-	$(CC) $(CC_FLAGS) ex_particle_OCL_naive_seq.o $(INCLUDES) -L$(OPENCL_LIB) -lOpenCL -o OCL_particlefilter_naive 
+	$(CC) $(CC_FLAGS) ex_particle_OCL_naive_seq.o $(INCLUDES) -L$(OPENCL_LIB) -lOpenCL -o OCL_particlefilter_naive
 
 OCL_particlefilter_double: ex_particle_OCL_double_seq.o
-	$(CC) $(CC_FLAGS) ex_particle_OCL_double_seq.o $(INCLUDES)  -L$(OPENCL_LIB) -lOpenCL -o OCL_particlefilter_double 
+	$(CC) $(CC_FLAGS) ex_particle_OCL_double_seq.o $(INCLUDES)  -L$(OPENCL_LIB) -lOpenCL -o OCL_particlefilter_double
 
 OCL_particlefilter_single: ex_particle_OCL_single_seq.o
-	$(CC) $(CC_FLAGS) ex_particle_OCL_single_seq.o $(INCLUDES)  -L$(OPENCL_LIB) -lOpenCL -o OCL_particlefilter_single 
+	$(CC) $(CC_FLAGS) ex_particle_OCL_single_seq.o $(INCLUDES)  -L$(OPENCL_LIB) -lOpenCL -o OCL_particlefilter_single
 
 
 %.o: %.[ch]

opencl/pathfinder/makefile

@@ -1,6 +1,6 @@
 include ../../common/make.config
 CXX = g++
-DEBUGFLAGS = -g
+DEBUGFLAGS = -g -O3
 # You will need to modify the following 2 lines
 # by inserting the correct path to the OpenCL
 # lib and inc directories.