Skip to content

Commit 422ea9e

Browse files
brnorris03brnorris03
committed
merged with SVN
1 parent 31e2ada commit 422ea9e

File tree

10 files changed

+0
-98
lines changed

10 files changed

+0
-98
lines changed

‎orio/main/cmd_line_opts.py

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,9 @@
1616
1717
Options:
1818
-c, --pre-command=<string> Command string with which to prefix the execution of the
19-
<<<<<<< HEAD
20-
Orio-built code, e.g., tauex
21-
=======
2219
Orio-built code, e.g., tau_exec
2320
--post-command=<string> Command string to run after each execution of Orio-built code,
2421
e.g., taudb_loadtrial
25-
>>>>>>> github/master
2622
-e, --erase-annot remove annotations from the output
2723
-h, --help display this message
2824
-o <file>, --output=<file> place the output in <file> (only valid when processing
@@ -127,11 +123,7 @@ def parse(self, argv):
127123
opts, args = getopt.getopt(orioargv,
128124
'c:ehko:p:rs:vx',
129125
['pre-command=', 'config=','configfile=', 'erase-annot', 'help', 'keep-temps',' output=',
130-
<<<<<<< HEAD
131-
'output-prefix=', 'rename-objects', 'spec=', 'verbose', 'extern', 'validate'])
132-
=======
133126
'output-prefix=', 'rename-objects', 'spec=', 'verbose', 'extern', 'validate', 'post-command='])
134-
>>>>>>> github/master
135127
except Exception, e:
136128
sys.stderr.write('Orio command-line error: %s' % e)
137129
sys.stderr.write(USAGE_MSG + '\n')
@@ -141,11 +133,8 @@ def parse(self, argv):
141133
for opt, arg in opts:
142134
if opt in ('-c', '--pre-command'):
143135
cmdline['pre_cmd'] = arg
144-
<<<<<<< HEAD
145-
=======
146136
elif opt in ('--post-command'):
147137
cmdline['post_cmd'] = arg
148-
>>>>>>> github/master
149138
elif opt in ('-e', '--erase-annot'):
150139
cmdline['erase_annot'] = True
151140
elif opt in ('-h', '--help'):

‎orio/main/opt_driver.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,11 +134,7 @@ def __optimizeCodeFrag(self, cfrag, perf_params):
134134

135135
# apply code transformations
136136
try:
137-
<<<<<<< HEAD
138-
if self.lang == 'cuda':
139-
=======
140137
if self.lang == 'cuda' or self.lang == 'opencl':
141-
>>>>>>> github/master
142138
transformation = mod_class(perf_params,
143139
cfrag.leader_ann.mod_code,
144140
optimized_body_code,

‎orio/main/orio_main.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,7 @@
1111
C_CPP = 1
1212
FORTRAN = 2
1313
CUDA = 3
14-
<<<<<<< HEAD
15-
=======
1614
OPENCL = 4
17-
>>>>>>> github/master
1815

1916
#----------------------------------------------
2017

@@ -30,11 +27,8 @@ def start(argv, lang):
3027
language = 'c'
3128
elif lang == CUDA:
3229
language = 'cuda'
33-
<<<<<<< HEAD
34-
=======
3530
elif lang == OPENCL:
3631
language = 'opencl'
37-
>>>>>>> github/master
3832
else:
3933
sys.stderr.write('orio.main.main: Language not supported at this time.')
4034
sys.exit(1)

‎orio/main/tspec/pparser.py

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,8 @@
2020
'msimplex_contraction_coef', 'msimplex_shrinkage_coef', 'msimplex_size', 'msimplex_x0',
2121
'simplex_reflection_coef', 'simplex_expansion_coef',
2222
'simplex_contraction_coef', 'simplex_shrinkage_coef', 'simplex_local_distance', 'simplex_x0',
23-
<<<<<<< HEAD
24-
'validation', 'validation_file', 'expected_output'
25-
, 'macro'
26-
=======
2723
'validation', 'validation_file', 'expected_output',
2824
'macro', 'performance_test_code', 'skeleton_test_code', 'skeleton_code_file'
29-
>>>>>>> github/master
3025
]
3126

3227
# map of reserved keywords
@@ -144,10 +139,7 @@ def p_def_type(p):
144139
| INPUT_VARS
145140
| SEARCH
146141
| VALIDATION
147-
<<<<<<< HEAD
148-
=======
149142
| PERFORMANCE_TEST_CODE
150-
>>>>>>> github/master
151143
'''
152144
p[0] = (p[1], p.lineno(1))
153145

@@ -216,11 +208,8 @@ def p_arg_type(p):
216208
| SIMPLEX_X0
217209
| VALIDATION_FILE
218210
| EXPECTED_OUTPUT
219-
<<<<<<< HEAD
220-
=======
221211
| SKELETON_TEST_CODE
222212
| SKELETON_CODE_FILE
223-
>>>>>>> github/master
224213
'''
225214
p[0] = (p[1], p.lineno(1))
226215

‎orio/main/tuner/ptest_codegen.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@
33
#
44

55
import random, re
6-
<<<<<<< HEAD
7-
import skeleton_code
8-
=======
96
import skeleton_code
10-
>>>>>>> github/master
117
from orio.main.util.globals import *
128
from orio.main.tuner.skeleton_code import SEQ_TIMER
139

@@ -349,12 +345,9 @@ def generate(self, code_map):
349345
if not self.decl_file:
350346
prologue_code += ('%s();' % self.malloc_func_name) + '\n '
351347
prologue_code += ('%s();' % self.init_func_name) + '\n'
352-
<<<<<<< HEAD
353-
=======
354348
if Globals().language == 'opencl':
355349
for (k, v) in Globals().metadata.iteritems():
356350
prologue_code += 'TAU_METADATA("%s", "%s");\n' % (k, v)
357-
>>>>>>> github/master
358351

359352
# create code for the epilogue section
360353
epilogue_code = ''
@@ -382,8 +375,6 @@ def __init__(self, input_params, input_decls, decl_file, init_file, skeleton_cod
382375
super(PerfTestCodeGenCUDA, self).__init__(input_params, input_decls, decl_file, init_file, skeleton_code_file, language,
383376
random_seed, use_parallel_search)
384377

385-
<<<<<<< HEAD
386-
=======
387378
# --------------------------------------------------------------------------------------
388379
class PerfTestCodeGenOpenCL(PerfTestCodeGen):
389380

@@ -393,7 +384,6 @@ def __init__(self, input_params, input_decls, decl_file, init_file, skeleton_cod
393384
random_seed, use_parallel_search)
394385

395386

396-
>>>>>>> github/master
397387

398388
# --------------------------------------------------------------------------------------
399389

‎orio/main/tuner/ptest_driver.py

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@
22
# To compile and execute the performance-testing code to get the performance cost
33
#
44

5-
<<<<<<< HEAD
6-
import os, time, re
7-
=======
85
import os, time, re, datetime, uuid
9-
>>>>>>> github/master
106

117
from orio.main.util.globals import *
128

@@ -41,21 +37,13 @@ def __init__(self, tinfo, use_parallel_search, language="c", timing_code=''):
4137
global perftest_counter
4238
perftest_counter += 1
4339

44-
<<<<<<< HEAD
45-
if not (language == 'c' or language == 'fortran' or language == 'cuda'):
46-
=======
4740
if not (language == 'c' or language == 'fortran' or language == 'cuda' or language == 'opencl'):
48-
>>>>>>> github/master
4941
err('orio.main.tuner.ptest_driver: unknown output language specified: %s' % language)
5042
self.language = language
5143

5244
self.__PTEST_FNAME=Globals().out_prefix+self.__PTEST_FNAME
5345

54-
<<<<<<< HEAD
55-
if language == 'c':
56-
=======
5746
if language == 'c' or language == 'opencl':
58-
>>>>>>> github/master
5947
self.ext = '.c'
6048
elif language == 'cuda':
6149
self.ext = '.cu'
@@ -67,11 +55,7 @@ def __init__(self, tinfo, use_parallel_search, language="c", timing_code=''):
6755
self.original_src_name = self.__PTEST_FNAME + '_original' + self.ext
6856
self.exe_name = self.__PTEST_FNAME + '.exe'
6957
self.original_exe_name = self.__PTEST_FNAME + '_original.exe'
70-
<<<<<<< HEAD
71-
if self.language == 'cuda':
72-
=======
7358
if self.language == 'cuda' or self.language == 'opencl':
74-
>>>>>>> github/master
7559
self.obj_name = self.__PTEST_FNAME + '.o'
7660
self.original_obj_name = self.__PTEST_FNAME + '_original.o'
7761

@@ -122,11 +106,7 @@ def __write(self, test_code, perf_param=None):
122106
err('orio.main.tuner.ptest_driver: cannot open file for writing: %s' % self.src_name)
123107

124108
if self.first:
125-
<<<<<<< HEAD
126-
if self.language != 'cuda' and not self.tinfo.timer_file and not (os.path.exists(self.timer_file)):
127-
=======
128109
if self.language != 'cuda' and self.language != 'opencl' and not self.tinfo.timer_file and not (os.path.exists(self.timer_file)):
129-
>>>>>>> github/master
130110
# Generate the timing routine file
131111
try:
132112
f = open(self.timer_file, 'w')
@@ -234,13 +214,10 @@ def __build(self, perf_param=None):
234214
if status:
235215
err('orio.main.tuner.ptest_driver: failed to compile the test cuda code: "%s"' % cmd)
236216
cmd = ('%s %s -o %s %s' % (build_cmd, self.extra_compiler_opts, self.exe_name, self.obj_name))
237-
<<<<<<< HEAD
238-
=======
239217
elif self.language == 'opencl':
240218
cmd = ('%s %s -o %s %s %s' % (build_cmd, self.extra_compiler_opts,
241219
self.exe_name, self.src_name2,
242220
self.tinfo.libs))
243-
>>>>>>> github/master
244221
else:
245222
cmd = ('%s %s -o %s %s %s %s' % (build_cmd, self.extra_compiler_opts,
246223
self.exe_name, self.src_name2,
@@ -272,11 +249,8 @@ def __build(self, perf_param=None):
272249
def __execute(self):
273250
'''Execute the test to get the performance costs'''
274251

275-
<<<<<<< HEAD
276-
=======
277252
Globals().metadata['src_filenames'] = ",".join(Globals().src_filenames)
278253

279-
>>>>>>> github/master
280254
# check if the executable exists
281255
if not os.path.exists(self.exe_name):
282256
err('orio.main.tuner.ptest_driver: the executable of the test code does not exist')
@@ -327,8 +301,6 @@ def __execute(self):
327301
except Exception, e:
328302
err('orio.main.tuner.ptest_driver: failed to execute the test code: "%s"\n --> %s: %s' % (cmd,e.__class__.__name__, e))
329303

330-
<<<<<<< HEAD
331-
=======
332304
if Globals().post_cmd is not None:
333305
try:
334306
cmd = Globals().post_cmd
@@ -342,7 +314,6 @@ def __execute(self):
342314
err('orio.main.tuner.ptest_driver: failed to execute the post-command: "%s"\n --> %s: %s' % (Globals().post_cmd,e.__class__.__name__, e))
343315

344316

345-
>>>>>>> github/master
346317
try:
347318
if out:
348319
#info('out: %s' % out)
@@ -422,10 +393,6 @@ def run(self, test_code, perf_param=None):
422393
@param test_code: the code for testing multiple coordinates in the search space
423394
@return: a dictionary of the times corresponding to each coordinate in the search space
424395
'''
425-
<<<<<<< HEAD
426-
427-
=======
428-
>>>>>>> github/master
429396
# write the testing code
430397
self.__write(test_code, perf_param=perf_param)
431398

‎orio/main/tuner/tuner.py

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,10 @@ def tune(self, module_body_code, line_no, cfrags):
6666
c = orio.main.tuner.ptest_codegen.PerfTestCodeGenCUDA(prob_size, tinfo.ivar_decls, tinfo.ivar_decl_file,
6767
tinfo.ivar_init_file, tinfo.ptest_skeleton_code_file, self.odriver.lang,
6868
tinfo.random_seed, use_parallel_search)
69-
<<<<<<< HEAD
70-
71-
=======
7269
elif self.odriver.lang == 'opencl':
7370
c = orio.main.tuner.ptest_codegen.PerfTestCodeGenCUDA(prob_size, tinfo.ivar_decls, tinfo.ivar_decl_file,
7471
tinfo.ivar_init_file, tinfo.ptest_skeleton_code_file, self.odriver.lang,
7572
tinfo.random_seed, use_parallel_search)
76-
>>>>>>> github/master
7773
elif self.odriver.lang == 'fortran':
7874
c = orio.main.tuner.ptest_codegen.PerfTestCodeGenFortran(prob_size, tinfo.ivar_decls, tinfo.ivar_decl_file,
7975
tinfo.ivar_init_file, tinfo.ptest_skeleton_code_file, self.odriver.lang,
@@ -124,23 +120,16 @@ def tune(self, module_body_code, line_no, cfrags):
124120
# perform the performance tuning for each distinct problem size
125121
optimized_code_seq = []
126122
for ptcodegen in ptcodegens:
127-
<<<<<<< HEAD
128-
129-
=======
130-
>>>>>>> github/master
131123
if Globals().verbose:
132124
info('\n----- begin empirical tuning for problem size -----')
133125
iparams = ptcodegen.input_params[:]
134126
iparams.sort(lambda x,y: cmp(x[0],y[0]))
135127
for pname, pvalue in iparams:
136128
info(' %s = %s' % (pname, pvalue))
137-
<<<<<<< HEAD
138-
=======
139129
iparams = ptcodegen.input_params[:]
140130
iparams.sort(lambda x,y: cmp(x[0],y[0]))
141131
for pname, pvalue in iparams:
142132
Globals().metadata['size_' + pname] = pvalue
143-
>>>>>>> github/master
144133

145134
# create the search engine
146135
search_eng = search_class({'cfrags':cfrags,

‎orio/main/util/globals.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,8 @@ def __init__(self,cmdline={}):
2323
self.language = 'c' # default language is C
2424
self.error_pre = "\x1B[00;31m"
2525
self.error_post = "\x1B[00m"
26-
<<<<<<< HEAD
27-
=======
2826
self.metadata = {'loop_transformations':[]}
2927

30-
>>>>>>> github/master
3128
if 'dry_run' in cmdline.keys():
3229
self.dry_run = cmdline['dry_run']
3330
else:
@@ -105,13 +102,10 @@ def __init__(self,cmdline={}):
105102
self.pre_cmd = cmdline['pre_cmd']
106103
else:
107104
self.pre_cmd = '' # Command string with which to prefix the execution of the Orio-built code
108-
<<<<<<< HEAD
109-
=======
110105
if 'post_cmd' in cmdline.keys():
111106
self.post_cmd = cmdline['post_cmd']
112107
else:
113108
self.post_cmd = None
114-
>>>>>>> github/master
115109

116110

117111
# Configure logging

‎orio/module/loop/ast.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,10 +203,7 @@ class BinOpExp(Exp):
203203
ASGN_SHL = 18
204204
BAND = 19
205205
SHR = 20
206-
<<<<<<< HEAD
207-
=======
208206
BOR = 21
209-
>>>>>>> github/master
210207

211208
def __init__(self, lhs, rhs, op_type, line_no = ''):
212209
'''Create a binary operation expression'''

‎orio/module/loop/codegen.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,9 @@ def __init__(self, language='C'):
2121
elif language.lower() in ['cuda']:
2222
from orio.module.loop.codegen_cuda import CodeGen_CUDA
2323
self.generator = CodeGen_CUDA()
24-
<<<<<<< HEAD
25-
=======
2624
elif language.lower() in ['opencl']:
2725
from orio.module.loop.codegen_opencl import CodeGen_OpenCL
2826
self.generator = CodeGen_OpenCL()
29-
>>>>>>> github/master
3027
else:
3128
g.err('orio.module.loop.codegen: Unknown language specified for code generation: %s' % language)
3229
pass

0 commit comments

Comments
 (0)