Clean up numsort.c

git-svn-id: svn://mattst88.com/svn/cleanbench/trunk@11 0d43b9a7-5ab2-4d7b-af9d-f64450cef757

1 files changed, 16 insertions, 16 deletions

diff --git a/Makefile b/Makefile
index 024a4d7..0bfa36a 100644
--- a/Makefile
+++ b/Makefile
@@ -19,15 +19,15 @@ default: nbench
 # You should leave -static in the CFLAGS so that your sysinfo can be
 # compiled into the executable.
 
-CCC=gcc
+ICC=icc
 GCC=gcc
 
 # generic options for gcc
 #CFLAGS=-O3 -mcpu=ev67 -mieee -funroll-loops -ftree-vectorize -fprefetch-loop-arrays -pipe -static -msmall-data -msmall-text
 #CFLAGS=-O3 -mcpu=ev67 -mieee -pipe -msmall-data -msmall-text -funroll-loops -ftree-vectorize -static
-GCCFLAGS=-O3 -march=k8 -msse3 -ftree-vectorize -funroll-loops -pipe
-#CCCFLAGS=-fast -unroll 0 -inline speed
-CCCFLAGS=${GCCFLAGS}
+GCCFLAGS=-O3 -march=k8 -msse3 -ftree-vectorize -funroll-loops -pipe -static
+#GCCFLAGS=-fast -unroll 0 -inline speed
+ICCFLAGS=-O2 -ip -xP -gcc -static
 LINKFLAGS=
 
 # if your gcc lets you do it, then try this one
@@ -120,33 +120,33 @@ nbench0.o: nbench0.h nbench0.c nmglobal.h hardware.h Makefile sysinfo.c sysinfoc
 # Segfault before first test
 
 emfloat.o: emfloat.h emfloat.c nmglobal.h Makefile
-	$(CCC) $(DEFINES) $(CCCFLAGS) -c emfloat.c
+	$(GCC) $(DEFINES) $(GCCFLAGS) -c emfloat.c
 
 randnum.o: randnum.c Makefile
-	$(CCC) $(DEFINES) $(CCCFLAGS) -c randnum.c
+	$(GCC) $(DEFINES) $(GCCFLAGS) -c randnum.c
 
 numsort.o: numsort.c
-	$(CCC) $(DEFINES) $(CCCFLAGS) -c numsort.c
+	$(GCC) $(DEFINES) $(GCCFLAGS) -c numsort.c
 # gcc - 2.95
 # ccc - 5.08
 
 stringsort.o: stringsort.c
-	$(CCC) $(DEFINES) $(CCCFLAGS) -c stringsort.c
+	$(GCC) $(DEFINES) $(GCCFLAGS) -c stringsort.c
 # gcc - 6.77
 # ccc - 7.24
 
 bitfield.o: bitfield.c
-	$(CCC) $(DEFINES) $(CCCFLAGS) -c bitfield.c
+	$(GCC) $(DEFINES) $(GCCFLAGS) -c bitfield.c
 # gcc - 4.93, 4.90, 4.93, 4.93
 # ccc - 4.79, 4.85, 4.81,
 
 fpemulation.o: fpemulation.c
-	$(CCC) $(DEFINES) $(CCCFLAGS) -c fpemulation.c
+	$(GCC) $(DEFINES) $(GCCFLAGS) -c fpemulation.c
 # gcc - 13.90
 # ccc - 13.90
 
 fourier.o: fourier.c
-	$(CCC) $(DEFINES) $(CCCFLAGS) -c fourier.c
+	$(GCC) $(DEFINES) $(GCCFLAGS) -c fourier.c
 # gcc - 15.96 
 # ccc - 19.30
 
@@ -156,14 +156,14 @@ assignment.o: assignment.c
 # ccc - 7.98
 
 idea.o: idea.c
-	$(CCC) $(DEFINES) $(CCCFLAGS) -c idea.c
+	$(GCC) $(DEFINES) $(GCCFLAGS) -c idea.c
 # gcc - 8.79
 # ccc - 9.10
 
 huffman.o: huffman.c
 	$(GCC) $(DEFINES) $(GCCFLAGS) -c huffman.c
-#	$(CCC) $(DEFINES) -O1 -host -unroll 0 -inline speed -c huffman.c -g3
-#	$(CCC) $(DEFINES) $(CCCFLAGS) -c huffman.c -g3
+#	$(GCC) $(DEFINES) -O1 -host -unroll 0 -inline speed -c huffman.c -g3
+#	$(GCC) $(DEFINES) $(GCCFLAGS) -c huffman.c -g3
 # gcc - 6.94
 # ccc - segfault
 # ccc -O1 -host - 5.14
@@ -171,12 +171,12 @@ huffman.o: huffman.c
 # ccc -O1 -host -unroll 0 -inline speed - 5.95
 
 neural.o: neural.c
-	$(CCC) $(DEFINES) $(CCCFLAGS) -c neural.c
+	$(GCC) $(DEFINES) $(GCCFLAGS) -c neural.c
 # gcc - 12.00
 # ccc - 14.20
 
 linear.o: linear.c
-	$(CCC) $(DEFINES) $(CCCFLAGS) -c linear.c
+	$(GCC) $(DEFINES) $(GCCFLAGS) -c linear.c
 # gcc - 16.38
 # ccc - 23.29