From b69f521dc696ab0611e3348f435a3dbcd4342868 Mon Sep 17 00:00:00 2001
From: John Regehr <regehr@cs.utah.edu>
Date: Thu, 22 Oct 2015 10:41:31 -0600
Subject: [PATCH] testing option change

---
 driver/evaluate_program | 43 +++++++++++++++++++++++++++++------------
 1 file changed, 31 insertions(+), 12 deletions(-)

diff --git a/driver/evaluate_program b/driver/evaluate_program
index 4e9a38749..2b2c52b6e 100755
--- a/driver/evaluate_program
+++ b/driver/evaluate_program
@@ -23,11 +23,11 @@ my $xxtra = "";
 #my $notmp = "-DUSE_MATH_MACROS_NOTMP";
 my $notmp = "";
 
-my $COMPILER_TIMEOUT = 30;
+my $COMPILER_TIMEOUT = 300;
 
 my $COMPILER_TIMEOUT_RES = 137;
 
-my $RUN_PROGRAM = 1;
+my $RUN_PROGRAM = 0;
 
 my $DO_REDUCE_CRASH = 1;
 my $DO_REDUCE_WRONG = 1;
@@ -43,17 +43,19 @@ my $LOCKFN = "/var/tmp/version_search_lockfile";
 ####################################################################
 
 my @gcc_opts = (
-    "-w -O0 -march=core-avx2 -mtune=core-avx2",
-    "-w -O1 -march=core-avx2 -mtune=core-avx2",
-    "-w -Og -march=core-avx2 -mtune=core-avx2",
-    "-w -Os -march=core-avx2 -mtune=core-avx2",
-    "-w -O2 -march=core-avx2 -mtune=core-avx2",
-    "-w -O3 -march=core-avx2 -mtune=core-avx2",
-    # "-w -Ofast -march=core-avx2 -mtune=core-avx2",
+    "-w -O0 -march=native -mtune=native",
+    "-w -O1 -march=native -mtune=native",
+    "-w -Os -march=native -mtune=native",
+    "-w -O2 -march=native -mtune=native",
+    "-w -O3 -march=native -mtune=native",
     );
 
 my @clang_opts = (
-    "-O -w",
+    "-O0 -w -march=native -mtune=native",
+    "-O1 -w -march=native -mtune=native",
+    "-O2 -w -march=native -mtune=native",
+    "-O3 -w -march=native -mtune=native",
+    "-Os -w -march=native -mtune=native",
     );
 
 my @o0only = (
@@ -67,6 +69,18 @@ my @gcc = ("gcc",
            "gcc",
            \@gcc_opts);
 
+my @gcc47 = ("gcc47",
+           "gcc-4.7",
+           \@gcc_opts);
+
+my @gcc46 = ("gcc46",
+           "gcc-4.6",
+           \@gcc_opts);
+
+my @gcc44 = ("gcc44",
+           "gcc-4.4",
+           \@gcc_opts);
+
 my $SOUPER = "/home/regehr/f/souper-regehr";
 
 my @souper_bare_opts = (
@@ -88,7 +102,7 @@ my @clang_souper = ("clang",
                     \@sclang_opts);
 
 my @clang = ("clang",
-	     "$SOUPER/third_party/llvm/Release/bin/clang",
+	     "clang",
 	     \@clang_opts);
 
 my @souper_bare = ("clang",
@@ -198,7 +212,12 @@ my @clang33 = ("clang33",
 my @compilers_to_test = (
 
     \@clang,
-    \@souper_bare,
+    \@gcc,
+
+    #\@gcc47,
+    #\@gcc46,
+    #\@gcc44,
+    #\@souper_bare,
 
     #\@gcccurrent,
     #\@ccomp,