search code cleanup

git-svn-id: https://svn.mcs.anl.gov/repos/performance/orio@643 e7ad4b5f-b827-0410-872f-f7f4bc3d1efb

Author: brnorris03

README

@@ -58,12 +58,20 @@ user uses Bash shell, of course).
 export PYTHONPATH=$PYTHONPATH:/home/username/lib/python/site-packages
 export PATH=$PATH:/home/username/bin
 
+After making sure that the orcc executable is in your path, you can 
+try some of the examples included in the testsuite subdirectory, e.g.:
+
+ > cd testsuite/axpy/simple
+ > orcc -v axpy5.c
+
+If Orio reports problems building the code, adjust the compiler settings in 
+the tuning spec included in the axpy5.c.
+
 ==================================================================================   
 
 CONTACT INFO
 
   Please send all questions, bugs reports, and comments to:
-    Albert Hartono    <[email protected]>, <[email protected]>
     Boyana Norris     <[email protected]>
 
 

TODO

@@ -1,3 +1,4 @@
+- clean up testsuite; add more examples of generated code
 - add an option to enable "best" time to return a list instead of a single value, e.g., 
   the list ot best times within epsilon of each other, or the top 5%, etc.
 - in batch systems, submit all jobs and then process results (currently it's one 

setup.py

@@ -19,6 +19,8 @@
         dir_names = rel_dir.split(os.sep)
         py_packages.append('.'.join(['orio'] + dir_names[1:]))
 
+print py_packages
+
 #-----------------------------------------------------------
 
 # to remove certain packages not included in the source distribution
@@ -41,7 +43,7 @@
 
 # make a call to the setup function
 setup(name = 'orio',
-      version = '0.2.0',
+      version = '0.2.2',
       description = 'ORIO -- An Annotation-Based Performance Tuning Tool',
       author = 'Albert Hartono',
       author_email = '[email protected]',
@@ -50,7 +52,7 @@
       url = 'https://trac.mcs.anl.gov/projects/performance/wiki/Orio',
       packages = py_packages,
       package_dir = {'orio' : 'src'},
-      package_data = {'orio' : ['tool/zestyparser/*']},
+      #package_data = {'orio' : ['tool/zestyparser/*']},
       scripts = ['orcc', 'orf'])
 
 

src/main/tspec/parser.py

@@ -24,7 +24,7 @@ def f_token(p, r, c):
 SPEC        = Token('spec')
 
 # tokens
-ID          = Token('[A-Za-z_][A-Za-z0-9_]*', group=0) >> f_token
+ID          = Token('[A-Za-z_]([A-Za-z0-9_\.]*[A-Za-z0-9_]+)*', group=0) >> f_token
 EQUALS      = Token('=')
 LBRACKET    = Token('\[')
 RBRACKET    = Token('\]')

src/main/tspec/tune_info.py

@@ -7,7 +7,10 @@
 #--------------------------------------------------------------
 
 class TuningInfo:
-    '''Tuning information'''
+    '''
+    Tuning information data structure created based on the information in the tuning
+    specification.
+    '''
 
     def __init__(self, build_info, pcount_info, search_info, pparam_info, iparam_info, 
                  ivar_info, ptest_code_info):
@@ -61,7 +64,7 @@ def __str__(self):
         return repr(self)
 
     def __repr__(self):
-        '''Return a string representation for this instance'''
+        '''Return a string representation for this instance (for debugging).'''
         s = ''
         s += '------------------\n'
         s += ' tuning info      \n'
@@ -92,8 +95,10 @@ def __repr__(self):
             s += '    %s: %s \n' % (id_name, rhs)
         s += ' input-variable declarations: \n'
         for is_static, dtype, id_name, ddims, rhs in self.ivar_decls:
+            modifier = 'dynamic'
+            if is_static: modifier = 'static'
             s += ('   %s %s %s %s = %s \n' %
-                  ('static' if is_static else 'dynamic', dtype, id_name, ddims, rhs))
+                      (modifier, dtype, id_name, ddims, rhs))
         s += ' input-variable declaration file: %s \n' % self.ivar_decl_file
         s += ' input-variable initialization file: %s \n' % self.ivar_init_file
         s += ' performance-test skeleton code file: %s \n' % self.ptest_skeleton_code_file
@@ -469,6 +474,8 @@ def __genInputVarsInfo(self, stmt_seq, def_line_no):
                 is_array = len(dim_exp_seq) > 0
                 is_static = 'static' in type_seq
                 is_dynamic = 'dynamic' in type_seq
+                # TODO handle structs
+
                 if is_static and is_dynamic:
                     print 'error:%s: a declared variable cannot be both static and dynamic' % line_no
                     sys.exit(1)

src/main/tuner/ptest_codegen.py

@@ -63,6 +63,7 @@ def __genDecls(self, input_decls):
         # generate the input variable declarations
         decls = []
         for is_static, vtype, vname, vdims, rhs in input_decls:
+            #TODO: handle structs (look for period in vname)
             if len(vdims) == 0:
                 decls.append('%s %s;' % (vtype, vname))
             else: