Skip to content

Commit

Permalink
Merge pull request #40 from clappis/master
Browse files Browse the repository at this point in the history
propagate compiler_tags specifically for "get_compiler_version" subaction.

I think it should be backwards compatible (I don't think we used compiler_tags in pipeline before) so I merge this PR...
  • Loading branch information
gfursin authored Jul 11, 2019
2 parents 55de289 + e266a09 commit 916f5d9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion CHANGES
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
* 2019.07.09 - [FGG] added flag --milepost_compiler_tags based on request here:
* 2019.07.09 - propagate compiler_tags specifically for "get_compiler_version" subaction based on request here:
https://groups.google.com/forum/#!topic/collective-knowledge/Lu-kQCSrhIE

* 2019.05.26 - [FGG] added 2 flags to ck run program
Expand Down
6 changes: 2 additions & 4 deletions module/program/module.py
Original file line number Diff line number Diff line change
Expand Up @@ -3741,7 +3741,6 @@ def pipeline(i):
(mali_hwc) - if 'yes', attempt to extract MALI GPU hardware counters
(milepost) - if 'yes', attempt to extract static program features using Milepost GCC and cTuning CC
(milepost_compiler_tags) - if !='', add those tags to resolve a compiler
(milepost_out_file) - if !='', record extracted MILEPOST features to this JSON file
(compile_timeout) - (sec.) - kill compile job if too long
Expand Down Expand Up @@ -3860,7 +3859,7 @@ def pipeline(i):

deps_cache=i.get('deps_cache',[])
reuse_deps=i.get('reuse_deps','')

ctags = ctags=i.get('compiler_tags','')
dep_add_tags = i.get('dep_add_tags', {})
for q in i:
if q.startswith('dep_add_tags.'):
Expand Down Expand Up @@ -3932,7 +3931,6 @@ def pipeline(i):
vtune=ck.get_from_dicts(i, 'vtune', '', choices)
valgrind=ck.get_from_dicts(i, 'valgrind', '', choices)
milepost=ck.get_from_dicts(i, 'milepost', '', choices)
milepost_compiler_tags=ck.get_from_dicts(i, 'milepost_compiler_tags', '', choices)
milepost_out_file=ck.get_from_dicts(i, 'milepost_out_file', '', None)

params=ck.get_from_dicts(i, 'params',{},choices)
Expand Down Expand Up @@ -4802,6 +4800,7 @@ def pipeline(i):
'tmp_dir':tdir,
'skip_clean_after':sca,
'compile_type':ctype,
'compiler_tags':ctags,
'flags':flags,
'lflags':lflags,
'console':cons,
Expand Down Expand Up @@ -5416,7 +5415,6 @@ def pipeline(i):
'env':env,
'extra_env':eenv,
'compiler_vars':cv,
'compiler_tags':milepost_compiler_tags,
'no_vars':ncv,
'remove_compiler_vars':rcv,
'extra_env_for_compilation':eefc,
Expand Down

0 comments on commit 916f5d9

Please sign in to comment.