Lerking/OSACA
1
0
Fork 0
mirror of https://github.com/RRZE-HPC/OSACA.git synced 2026-01-05 10:40:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

no \t replacement before any other point than user output

Browse Source
This commit is contained in:
JanLJL
2020-10-16 09:44:18 +02:00
parent e8b78e4cc6
commit c64a24ae1b
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
osaca/frontend.py
View File

@@ -76,7 +76,7 @@ class Frontend(object):
self._get_flag_symbols(instruction_form['flags']) self._get_flag_symbols(instruction_form['flags'])
if instruction_form['instruction'] is not None if instruction_form['instruction'] is not None
else ' ', else ' ',
instruction_form['line'].strip(), instruction_form['line'].strip().replace('\t', ' '),
) )
line = line if show_lineno else col_sep + col_sep.join(line.split(col_sep)[1:]) line = line if show_lineno else col_sep + col_sep.join(line.split(col_sep)[1:])
if show_cmnts is False and self._is_comment(instruction_form): if show_cmnts is False and self._is_comment(instruction_form):
@@ -138,7 +138,7 @@ class Frontend(object):
separator, separator,
sum([instr_form['latency_lcd'] for instr_form in dep_dict[dep]['dependencies']]), sum([instr_form['latency_lcd'] for instr_form in dep_dict[dep]['dependencies']]),
separator, separator,
dep_dict[dep]['root']['line'], dep_dict[dep]['root']['line'].strip(),
separator, separator,
[node['line_number'] for node in dep_dict[dep]['dependencies']], [node['line_number'] for node in dep_dict[dep]['dependencies']],
) )
@@ -246,7 +246,7 @@ class Frontend(object):
self._get_flag_symbols(instruction_form['flags']) self._get_flag_symbols(instruction_form['flags'])
if instruction_form['instruction'] is not None if instruction_form['instruction'] is not None
else ' ', else ' ',
instruction_form['line'].strip(), instruction_form['line'].strip().replace('\t', ' '),
) )
s += '\n' s += '\n'
# check for unknown instructions and throw warning if called without --ignore-unknown # check for unknown instructions and throw warning if called without --ignore-unknown

2
osaca/parser/parser_AArch64.py
View File

@@ -218,7 +218,7 @@ class ParserAArch64(BaseParser):
self.DIRECTIVE_ID: None, self.DIRECTIVE_ID: None,
self.COMMENT_ID: None, self.COMMENT_ID: None,
self.LABEL_ID: None, self.LABEL_ID: None,
'line': line.strip().replace('\t',' '), 'line': line,
'line_number': line_number, 'line_number': line_number,
} }
) )

2
osaca/parser/parser_x86att.py
View File

@@ -184,7 +184,7 @@ class ParserX86ATT(BaseParser):
self.DIRECTIVE_ID: None, self.DIRECTIVE_ID: None,
self.COMMENT_ID: None, self.COMMENT_ID: None,
self.LABEL_ID: None, self.LABEL_ID: None,
'line': line.strip(), 'line': line,
'line_number': line_number, 'line_number': line_number,
} }
) )

4
tests/test_parser_AArch64.py
View File

@@ -146,8 +146,8 @@ class TestParserAArch64(unittest.TestCase):
def test_parse_line(self): def test_parse_line(self):
line_comment = '// -- Begin main' line_comment = '// -- Begin main'
line_label = '.LBB0_1: // =>This Inner Loop Header: Depth=1' line_label = '.LBB0_1: // =>This Inner Loop Header: Depth=1'
line_directive = '\t.cfi_def_cfa w29, -16' line_directive = '.cfi_def_cfa w29, -16'
line_instruction = '\tldr s0, [x11, w10, sxtw #2] // = <<2' line_instruction = 'ldr s0, [x11, w10, sxtw #2] // = <<2'
line_prefetch = 'prfm pldl1keep, [x26, #2048] //HPL' line_prefetch = 'prfm pldl1keep, [x26, #2048] //HPL'
line_preindexed = 'stp x29, x30, [sp, #-16]!' line_preindexed = 'stp x29, x30, [sp, #-16]!'
line_postindexed = 'ldp q2, q3, [x11], #64' line_postindexed = 'ldp q2, q3, [x11], #64'

4
tests/test_parser_x86att.py
View File

@@ -156,8 +156,8 @@ class TestParserX86ATT(unittest.TestCase):
def test_parse_line(self): def test_parse_line(self):
line_comment = '# -- Begin main' line_comment = '# -- Begin main'
line_label = '..B1.7: # Preds ..B1.6' line_label = '..B1.7: # Preds ..B1.6'
line_directive = '\t\t.quad .2.3_2__kmpc_loc_pack.2 #qed' line_directive = '.quad .2.3_2__kmpc_loc_pack.2 #qed'
line_instruction = '\t\tlea 2(%rax,%rax), %ecx #12.9' line_instruction = 'lea 2(%rax,%rax), %ecx #12.9'
instruction_form_1 = { instruction_form_1 = {
'instruction': None, 'instruction': None,