This is an archive of the discontinued LLVM Phabricator instance.

llvm/utils/UpdateTestChecks/asm.py
170	Do you ever seen this `(?:\s\.?Lfunc_begin[^:\n]:\n)?[^:]?` in the output? I'm thinking that specifying only `r'^_?(?P<func>[^:]+):[ \t]#+[ \t]*@(?P=func)\n'` is good enough for us.

Remove func_begin match

simoll added inline comments.Dec 23 2021, 2:05 AM

llvm/utils/UpdateTestChecks/asm.py
170	I regenerated some tests with the shorter regex and it works fine.

Harbormaster completed remote builds in B140493: Diff 396001.Dec 23 2021, 2:40 AM

LGTM.

This revision is now accepted and ready to land.Dec 23 2021, 4:26 AM

This revision was landed with ongoing or failed builds.Dec 23 2021, 5:14 AM

Closed by commit rG2810c3403e42: [VE] Add VE support to update_llc_test_checks (authored by simoll). · Explain Why

This revision was automatically updated to reflect the committed changes.

simoll added a commit: rG2810c3403e42: [VE] Add VE support to update_llc_test_checks.

Revision Contents

Path

Size

llvm/

utils/

UpdateTestChecks/

asm.py

18 lines

Diff 396011

llvm/utils/UpdateTestChecks/asm.py

Show First 20 Lines • Show All 160 Lines • ▼ Show 20 Lines	ASM_FUNCTION_ARM_IOS_RE = re.compile(
flags=(re.M \| re.S))		flags=(re.M \| re.S))

ASM_FUNCTION_WASM32_RE = re.compile(		ASM_FUNCTION_WASM32_RE = re.compile(
r'^_?(?P<func>[^:]+):[ \t]#+[ \t]@"?(?P=func)"?\n'		r'^_?(?P<func>[^:]+):[ \t]#+[ \t]@"?(?P=func)"?\n'
r'(?P<body>.*?)\n'		r'(?P<body>.*?)\n'
r'^\s*(\.Lfunc_end[0-9]+:\n\|end_function)',		r'^\s*(\.Lfunc_end[0-9]+:\n\|end_function)',
flags=(re.M \| re.S))		flags=(re.M \| re.S))

		ASM_FUNCTION_VE_RE = re.compile(
		r'^_?(?P<func>[^:]+):[ \t]#+[ \t]@(?P=func)\n'
		kaz7Unsubmitted Not Done Reply Inline Actions Do you ever seen this `(?:\s\.?Lfunc_begin[^:\n]:\n)?[^:]?` in the output? I'm thinking that specifying only `r'^_?(?P<func>[^:]+):[ \t]#+[ \t]@(?P=func)\n'` is good enough for us. kaz7:* Do you ever seen this `(?:\s\.?Lfunc_begin[^:\n]:\n)?[^:]*?` in the output? I'm thinking…
		simollAuthorUnsubmitted Done Reply Inline Actions I regenerated some tests with the shorter regex and it works fine. simoll: I regenerated some tests with the shorter regex and it works fine.
		r'(?P<body>^##?[ \t]+[^:]+:.?)\s'
		r'.Lfunc_end[0-9]+:\n',
		flags=(re.M \| re.S))

SCRUB_X86_SHUFFLES_RE = (		SCRUB_X86_SHUFFLES_RE = (
re.compile(		re.compile(
r'^(\s\w+) [^#\n]+#+ ((?:[xyz]mm\d+\|mem)( \{%k\d+\}( \{z\})?)? = .)$',		r'^(\s\w+) [^#\n]+#+ ((?:[xyz]mm\d+\|mem)( \{%k\d+\}( \{z\})?)? = .)$',
flags=re.M))		flags=re.M))

SCRUB_X86_SHUFFLES_NO_MEM_RE = (		SCRUB_X86_SHUFFLES_NO_MEM_RE = (
re.compile(		re.compile(
r'^(\s\w+) [^#\n]+#+ ((?:[xyz]mm\d+\|mem)( \{%k\d+\}( \{z\})?)? = (?!.(?:mem)).*)$',		r'^(\s\w+) [^#\n]+#+ ((?:[xyz]mm\d+\|mem)( \{%k\d+\}( \{z\})?)? = (?!.(?:mem)).*)$',
▲ Show 20 Lines • Show All 172 Lines • ▼ Show 20 Lines	def scrub_asm_wasm32(asm, args):
# whitespace in place.		# whitespace in place.
asm = common.SCRUB_WHITESPACE_RE.sub(r' ', asm)		asm = common.SCRUB_WHITESPACE_RE.sub(r' ', asm)
# Expand the tabs used for indentation.		# Expand the tabs used for indentation.
asm = string.expandtabs(asm, 2)		asm = string.expandtabs(asm, 2)
# Strip trailing whitespace.		# Strip trailing whitespace.
asm = common.SCRUB_TRAILING_WHITESPACE_RE.sub(r'', asm)		asm = common.SCRUB_TRAILING_WHITESPACE_RE.sub(r'', asm)
return asm		return asm

		def scrub_asm_ve(asm, args):
		# Scrub runs of whitespace out of the assembly, but leave the leading
		# whitespace in place.
		asm = common.SCRUB_WHITESPACE_RE.sub(r' ', asm)
		# Expand the tabs used for indentation.
		asm = string.expandtabs(asm, 2)
		# Strip trailing whitespace.
		asm = common.SCRUB_TRAILING_WHITESPACE_RE.sub(r'', asm)
		return asm

def get_triple_from_march(march):		def get_triple_from_march(march):
triples = {		triples = {
'amdgcn': 'amdgcn',		'amdgcn': 'amdgcn',
'r600': 'r600',		'r600': 'r600',
'mips': 'mips',		'mips': 'mips',
'sparc': 'sparc',		'sparc': 'sparc',
'hexagon': 'hexagon',		'hexagon': 'hexagon',
		've': 've',
}		}
for prefix, triple in triples.items():		for prefix, triple in triples.items():
if march.startswith(prefix):		if march.startswith(prefix):
return triple		return triple
print("Cannot find a triple. Assume 'x86'", file=sys.stderr)		print("Cannot find a triple. Assume 'x86'", file=sys.stderr)
return 'x86'		return 'x86'

def get_run_handler(triple):		def get_run_handler(triple):
Show All 27 Lines	target_handlers = {
'ppc32': (scrub_asm_powerpc, ASM_FUNCTION_PPC_RE),		'ppc32': (scrub_asm_powerpc, ASM_FUNCTION_PPC_RE),
'powerpc': (scrub_asm_powerpc, ASM_FUNCTION_PPC_RE),		'powerpc': (scrub_asm_powerpc, ASM_FUNCTION_PPC_RE),
'riscv32': (scrub_asm_riscv, ASM_FUNCTION_RISCV_RE),		'riscv32': (scrub_asm_riscv, ASM_FUNCTION_RISCV_RE),
'riscv64': (scrub_asm_riscv, ASM_FUNCTION_RISCV_RE),		'riscv64': (scrub_asm_riscv, ASM_FUNCTION_RISCV_RE),
'lanai': (scrub_asm_lanai, ASM_FUNCTION_LANAI_RE),		'lanai': (scrub_asm_lanai, ASM_FUNCTION_LANAI_RE),
'sparc': (scrub_asm_sparc, ASM_FUNCTION_SPARC_RE),		'sparc': (scrub_asm_sparc, ASM_FUNCTION_SPARC_RE),
's390x': (scrub_asm_systemz, ASM_FUNCTION_SYSTEMZ_RE),		's390x': (scrub_asm_systemz, ASM_FUNCTION_SYSTEMZ_RE),
'wasm32': (scrub_asm_wasm32, ASM_FUNCTION_WASM32_RE),		'wasm32': (scrub_asm_wasm32, ASM_FUNCTION_WASM32_RE),
		've': (scrub_asm_ve, ASM_FUNCTION_VE_RE),
}		}
handler = None		handler = None
best_prefix = ''		best_prefix = ''
for prefix, s in target_handlers.items():		for prefix, s in target_handlers.items():
if triple.startswith(prefix) and len(prefix) > len(best_prefix):		if triple.startswith(prefix) and len(prefix) > len(best_prefix):
handler = s		handler = s
best_prefix = prefix		best_prefix = prefix

Show All 12 Lines

This is an archive of the discontinued LLVM Phabricator instance.

[VE] Add VE support to update_llc_test_checksClosedPublic

Details

Diff Detail

Event Timeline

Revision Contents

Diff 396011

llvm/utils/UpdateTestChecks/asm.py

[VE] Add VE support to update_llc_test_checks
ClosedPublic