From 71c73110739c4b54dcbede79ae3aacd2d48272b1 Mon Sep 17 00:00:00 2001
From: Keaton Mowery <kmowery@gmail.com>
Date: Fri, 20 Mar 2015 19:43:38 -0700
Subject: [PATCH] Stop clang inlining; add a SETUP phase; allow variable names
 to be passed as arguments

---
 qtt.py  | 17 ++++++++++++-----
 timer.c |  2 ++
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/qtt.py b/qtt.py
index e61a2a9..f53b97e 100755
--- a/qtt.py
+++ b/qtt.py
@@ -35,6 +35,7 @@ class QTT:
     temp_file = ""
     testcount = 0
     functions = {}
+    setup = ""
     temp_file = "/tmp/qtt_tmp.c"
 
     def gcc_build(self):
@@ -42,15 +43,18 @@ def gcc_build(self):
             ("INCLUDES_HERE",self.all_includes),
             ("FUNCTIONS_HERE", "\n".join(self.functions.values())),
             ("TESTFUNCTIONS",self.all_tests),
+            ("SETUP", self.setup),
             ("TESTRUNS",self.all_testcalls)])
 
-        gccstring = "gcc -O -fforce-addr -std=c99 -o a.qtt -I. -L. "
+        gccstring = "gcc -O -std=c99 -o a.qtt -I. -L. "
         for f in self.all_add_gcc_files:
             if f != "":
                 if f[-2:] == '.c':
                     gccstring += "--include "+f+" "
                 elif f[-3:] == ".so":
                     gccstring += f+" "
+                elif f[:2] == "-l":
+                    gccstring += f+" "
                 else:
                     print_unimp("File type:"+f)
                     return -1
@@ -102,12 +106,15 @@ def extract_c_data(self,cfunction,includefiles):
 
     def arg_to_string(self,a):
         if type(a) is str:
-            return '\"'+a+'\"'
+            return a
         elif isinstance(a,QTTvar):
             return a.s
         else:
             return str(a)
 
+    def add_setup(self, setup):
+        self.setup += setup + "\n"
+
     def add_include(self,includefiles):
         includes_s = ""
         if includefiles != "":
@@ -153,7 +160,7 @@ def make_func(self, num, ret_s, types_s, typedargs_s, args_s):
         #   return (end-st-offset)/(float)PERF_ITRS;
         # }
 
-        functext = "double __run_test_"+str(num)+"("+ret_s+" (*function) ("+types_s+"),"+typedargs_s+"){\n"
+        functext = "double __attribute__((noinline)) __run_test_"+str(num)+"("+ret_s+" (*function) ("+types_s+"),"+typedargs_s+"){\n"
         functext +="  int ctr = 0;\n"
         functext +="  uint8_t real = 0;\n"
         functext +="  uint64_t st;\n"
@@ -270,9 +277,9 @@ def asm_snippet(self, fname, arglist, assembly, outputs, inputs, clobbers, testn
 
         testruns = []
         for args in arglist:
-            args = ", ".join([self.arg_to_string(a) for a in args])
+            args = ", ".join([self.arg_to_string(a) + "LL" for a in args])
 
-            testruns += [r"""printf("%s %-40s %%f\n", __run_test_%d(%s, %s));"""% \
+            testruns += [r"""printf("%s %-60s %%f\n", __run_test_%d(%s, %s));"""% \
               (fname, args, testnum, test_function_name, args)]
 
         return ("\n".join(testruns), self.make_func(testnum, function_type, types, typedargs, argnames))
diff --git a/timer.c b/timer.c
index 77731ff..7f10bdc 100644
--- a/timer.c
+++ b/timer.c
@@ -27,6 +27,8 @@ int main(int argc, char* argv[]){
   printf(    "function ""     cycles\n");
   printf(    "====================\n");
 
+  SETUP
+
   TESTRUNS
 
   return 0;