This is an archive of the discontinued LLVM Phabricator instance.

Differential D157858

[UpdateTestChecks] Add support for SPIRV in update_llc_test_checks.py
AbandonedPublic

Authored by pmatos on Aug 14 2023, 4:29 AM.

Details

Reviewers
mpaszkowski
zuban32
Summary

We have to change the location of the comment for function start
in SPIRV. We add a new command line flag --skip-check-label, because
there's no function label on SPIRV.

Diff Detail

Event Timeline

pmatos created this revision.Aug 14 2023, 4:29 AM
Herald added a project: Restricted Project. · View Herald TranscriptAug 14 2023, 4:29 AM
Herald added subscribers: asb, luismarques, wingo and 3 others. · View Herald Transcript
pmatos requested review of this revision.Aug 14 2023, 4:29 AM
Herald added a reviewer: zuban32. · View Herald TranscriptAug 14 2023, 4:29 AM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added a subscriber: llvm-commits. · View Herald Transcript
Harbormaster completed remote builds in B252309: Diff 549873.Aug 14 2023, 4:30 AM
pmatos updated this revision to Diff 549875.Aug 14 2023, 4:31 AM

Remove expect.ll that was mistakingly added to the commit.

Harbormaster completed remote builds in B252311: Diff 549875.Aug 14 2023, 4:31 AM
pmatos updated this revision to Diff 549876.Aug 14 2023, 4:32 AM

Rebase on current main.

Harbormaster completed remote builds in B252312: Diff 549876.Aug 14 2023, 7:01 AM
pmatos abandoned this revision.Sep 13 2023, 7:16 AM

Rebased and moved work to PR https://github.com/llvm/llvm-project/pull/66213.
Closing revision.

GitHub <noreply@github.com> mentioned this in rG0495cd89fc6e: [UpdateTestChecks] Add support for SPIRV in update_llc_test_checks.py (#66213).Sep 21 2023, 3:51 AM

Revision Contents

PathSize
llvm/
lib/
Target/
SPIRV/
1 line
test/
CodeGen/
SPIRV/
16 lines
utils/
UpdateTestChecks/
30 lines
12 lines

Diff 549876

llvm/lib/Target/SPIRV/SPIRVAsmPrinter.cpp

Show First 20 Lines • Show All 109 Lines • ▼ Show 20 Linesvoid SPIRVAsmPrinter::emitFunctionHeader() {
ST = &MF->getSubtarget<SPIRVSubtarget>(); ST = &MF->getSubtarget<SPIRVSubtarget>();
TII = ST->getInstrInfo(); TII = ST->getInstrInfo();
const Function &F = MF->getFunction(); const Function &F = MF->getFunction();
if (isVerbose()) { if (isVerbose()) {
OutStreamer->getCommentOS() OutStreamer->getCommentOS()
<< "-- Begin function " << "-- Begin function "
<< GlobalValue::dropLLVMManglingEscape(F.getName()) << '\n'; << GlobalValue::dropLLVMManglingEscape(F.getName()) << '\n';
OutStreamer->addBlankLine();
} }
auto Section = getObjFileLowering().SectionForGlobal(&F, TM); auto Section = getObjFileLowering().SectionForGlobal(&F, TM);
MF->setSection(Section); MF->setSection(Section);
} }
void SPIRVAsmPrinter::outputOpFunctionEnd() { void SPIRVAsmPrinter::outputOpFunctionEnd() {
MCInst FunctionEndInst; MCInst FunctionEndInst;
▲ Show 20 Lines • Show All 420 Lines • Show Last 20 Lines

llvm/test/CodeGen/SPIRV/optnone.ll

;; Check that optnone is correctly ignored when extension is not enabled ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --skip-check-label --version 2
; RUN: llc -O0 -mtriple=spirv32-unknown-unknown %s -o - | FileCheck %s --check-prefix=CHECK-SPIRV ; RUN: llc -O0 -mtriple=spirv32-unknown-unknown %s -o - | FileCheck %s
; CHECK-SPIRV: OpCapability OptNoneINTEL ; CHECK: OpCapability OptNoneINTEL
; CHECK-SPIRV: OpExtension "SPV_INTEL_optnone" ; CHECK-NEXT: OpExtension "SPV_INTEL_optnone"
;; Per SPIR-V spec:
;; FunctionControlDontInlineMask = 0x2 (2)
; CHECK-SPIRV: %[[#]] = OpFunction %[[#]] DontInline
; Function Attrs: nounwind optnone noinline ; Function Attrs: nounwind optnone noinline
define spir_func void @_Z3foov() #0 { define spir_func void @_Z3foov() #0 {
; CHECK: %4 = OpFunction %2 DontInline %3
; CHECK-NEXT: %5 = OpLabel
; CHECK-NEXT: OpReturn
; CHECK-NEXT: OpFunctionEnd
entry: entry:
ret void ret void
} }
attributes #0 = { nounwind optnone noinline } attributes #0 = { nounwind optnone noinline }

llvm/utils/UpdateTestChecks/asm.py

Show All 9 Lines class string:
expandtabs = str.expandtabs expandtabs = str.expandtabs
else: else:
import string import string
# RegEx: this is where the magic happens. # RegEx: this is where the magic happens.
##### Assembly parser ##### Assembly parser
#
# The set of per-arch regular expressions define several groups.
# The required groups are "func" (function name) and "body" (body of the function).
# Although some backends require some additional groups like: "directives"
# and "func_name_separator"
ASM_FUNCTION_X86_RE = re.compile( ASM_FUNCTION_X86_RE = re.compile(
r'^_?(?P<func>[^:]+):[ \t]*#+[ \t]*(@"?(?P=func)"?| -- Begin function (?P=func))\n(?:\s*\.?Lfunc_begin[^:\n]*:\n)?' r'^_?(?P<func>[^:]+):[ \t]*#+[ \t]*(@"?(?P=func)"?| -- Begin function (?P=func))\n(?:\s*\.?Lfunc_begin[^:\n]*:\n)?'
r"(?:\.L(?P=func)\$local:\n)?" # drop .L<func>$local: r"(?:\.L(?P=func)\$local:\n)?" # drop .L<func>$local:
r"(?:\s*\.type\s+\.L(?P=func)\$local,@function\n)?" # drop .type .L<func>$local r"(?:\s*\.type\s+\.L(?P=func)\$local,@function\n)?" # drop .type .L<func>$local
r"(?:[ \t]*(?:\.cfi_startproc|\.cfi_personality|\.cfi_lsda|\.seh_proc|\.seh_handler)\b[^\n]*\n)*" # drop optional cfi r"(?:[ \t]*(?:\.cfi_startproc|\.cfi_personality|\.cfi_lsda|\.seh_proc|\.seh_handler)\b[^\n]*\n)*" # drop optional cfi
r"(?P<body>^##?[ \t]+[^:]+:.*?)\s*" r"(?P<body>^##?[ \t]+[^:]+:.*?)\s*"
r"^\s*(?:[^:\n]+?:\s*\n\s*\.size|\.cfi_endproc|\.globl|\.comm|\.(?:sub)?section|#+ -- End function)", r"^\s*(?:[^:\n]+?:\s*\n\s*\.size|\.cfi_endproc|\.globl|\.comm|\.(?:sub)?section|#+ -- End function)",
▲ Show 20 Lines • Show All 166 Lines • ▼ Show 20 Lines
ASM_FUNCTION_WASM_RE = re.compile( ASM_FUNCTION_WASM_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),
) )
# We parse the function name from the comments issued by the backend:
# ; -- Begin function <name>
# and then the final comment
# ; -- End function
# If these change in the future, we need to change the regex.
ASM_FUNCTION_SPIRV_RE = re.compile(
r'[ \t]+; \-\- Begin function (?P<func>[^\n]+)\n'
r"(?P<body>.*?)\n"
r"[ \t]+; \-\- End function",
flags=(re.M | re.S),
)
ASM_FUNCTION_VE_RE = re.compile( ASM_FUNCTION_VE_RE = re.compile(
r"^_?(?P<func>[^:]+):[ \t]*#+[ \t]*@(?P=func)\n" r"^_?(?P<func>[^:]+):[ \t]*#+[ \t]*@(?P=func)\n"
r"(?:\s*\.?L(?P=func)\$local:\n)?" # optional .L<func>$local: due to -fno-semantic-interposition r"(?:\s*\.?L(?P=func)\$local:\n)?" # optional .L<func>$local: due to -fno-semantic-interposition
r"(?:\s*\.type\s+\.?L(?P=func)\$local,@function\n)?" # optional .type .L<func>$local r"(?:\s*\.type\s+\.?L(?P=func)\$local,@function\n)?" # optional .type .L<func>$local
r"(?:\s*\.?Lfunc_begin[^:\n]*:\n)?[^:]*?" r"(?:\s*\.?Lfunc_begin[^:\n]*:\n)?[^:]*?"
r"(?P<body>^##?[ \t]+[^:]+:.*?)\s*" r"(?P<body>^##?[ \t]+[^:]+:.*?)\s*"
r".Lfunc_end[0-9]+:\n", r".Lfunc_end[0-9]+:\n",
flags=(re.M | re.S), flags=(re.M | re.S),
▲ Show 20 Lines • Show All 220 Lines • ▼ Show 20 Linesdef scrub_asm_sparc(asm, args):
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_spirv(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 scrub_asm_systemz(asm, args): def scrub_asm_systemz(asm, args):
# Scrub runs of whitespace out of the assembly, but leave the leading # Scrub runs of whitespace out of the assembly, but leave the leading
# 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)
▲ Show 20 Lines • Show All 98 Lines • ▼ Show 20 Lines target_handlers = {
"avr": (scrub_asm_avr, ASM_FUNCTION_AVR_RE), "avr": (scrub_asm_avr, ASM_FUNCTION_AVR_RE),
"ppc32": (scrub_asm_powerpc, ASM_FUNCTION_PPC_RE), "ppc32": (scrub_asm_powerpc, ASM_FUNCTION_PPC_RE),
"ppc64": (scrub_asm_powerpc, ASM_FUNCTION_PPC_RE), "ppc64": (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),
"spirv32": (scrub_asm_spirv, ASM_FUNCTION_SPIRV_RE),
"spirv64": (scrub_asm_spirv, ASM_FUNCTION_SPIRV_RE),
"s390x": (scrub_asm_systemz, ASM_FUNCTION_SYSTEMZ_RE), "s390x": (scrub_asm_systemz, ASM_FUNCTION_SYSTEMZ_RE),
"wasm32": (scrub_asm_wasm, ASM_FUNCTION_WASM_RE), "wasm32": (scrub_asm_wasm, ASM_FUNCTION_WASM_RE),
"wasm64": (scrub_asm_wasm, ASM_FUNCTION_WASM_RE), "wasm64": (scrub_asm_wasm, ASM_FUNCTION_WASM_RE),
"ve": (scrub_asm_ve, ASM_FUNCTION_VE_RE), "ve": (scrub_asm_ve, ASM_FUNCTION_VE_RE),
"csky": (scrub_asm_csky, ASM_FUNCTION_CSKY_RE), "csky": (scrub_asm_csky, ASM_FUNCTION_CSKY_RE),
"nvptx": (scrub_asm_nvptx, ASM_FUNCTION_NVPTX_RE), "nvptx": (scrub_asm_nvptx, ASM_FUNCTION_NVPTX_RE),
"loongarch32": (scrub_asm_loongarch, ASM_FUNCTION_LOONGARCH_RE), "loongarch32": (scrub_asm_loongarch, ASM_FUNCTION_LOONGARCH_RE),
"loongarch64": (scrub_asm_loongarch, ASM_FUNCTION_LOONGARCH_RE), "loongarch64": (scrub_asm_loongarch, ASM_FUNCTION_LOONGARCH_RE),
▲ Show 20 Lines • Show All 41 Lines • Show Last 20 Lines

llvm/utils/UpdateTestChecks/common.py

Show First 20 Lines • Show All 188 Lines • ▼ Show 20 Lines parser.add_argument(
help="List of regular expressions that a global value declaration must match to generate a check (has no effect if checking globals is not enabled)", help="List of regular expressions that a global value declaration must match to generate a check (has no effect if checking globals is not enabled)",
) )
parser.add_argument( parser.add_argument(
"--global-hex-value-regex", "--global-hex-value-regex",
nargs="+", nargs="+",
default=[], default=[],
help="List of regular expressions such that, for matching global value declarations, literal integer values should be encoded in hex in the associated FileCheck directives", help="List of regular expressions such that, for matching global value declarations, literal integer values should be encoded in hex in the associated FileCheck directives",
) )
parser.add_argument(
"--skip-check-label",
action="store_true",
dest="skip_check_label",
default=False,
help="Activate CHECK-LABEL line generation per function",
)
# FIXME: in 3.9, we can use argparse.BooleanOptionalAction. At that point, # FIXME: in 3.9, we can use argparse.BooleanOptionalAction. At that point,
# we need to rename the flag to just -generate-body-for-unused-prefixes. # we need to rename the flag to just -generate-body-for-unused-prefixes.
parser.add_argument( parser.add_argument(
"--no-generate-body-for-unused-prefixes", "--no-generate-body-for-unused-prefixes",
action="store_false", action="store_false",
dest="gen_unused_prefix_body", dest="gen_unused_prefix_body",
default=True, default=True,
help="Generate a function body that always matches for unused prefixes. This is useful when unused prefixes are desired, and it avoids needing to annotate each FileCheck as allowing them.", help="Generate a function body that always matches for unused prefixes. This is useful when unused prefixes are desired, and it avoids needing to annotate each FileCheck as allowing them.",
) )
# This is the default when regenerating existing tests. The default when # This is the default when regenerating existing tests. The default when
# generating new tests is determined by DEFAULT_VERSION. # generating new tests is determined by DEFAULT_VERSION.
parser.add_argument( parser.add_argument(
"--version", type=int, default=1, help="The version of output format" "--version", type=int, default=1, help="The version of output format"
) )
args = parser.parse_args() args = parser.parse_args()
global _verbose, _global_value_regex, _global_hex_value_regex global _verbose, _global_value_regex, _global_hex_value_regex, _skip_check_label
_verbose = args.verbose _verbose = args.verbose
_global_value_regex = args.global_value_regex _global_value_regex = args.global_value_regex
_global_hex_value_regex = args.global_hex_value_regex _global_hex_value_regex = args.global_hex_value_regex
_skip_check_label = args.skip_check_label
return args return args
def parse_args(parser, argv): def parse_args(parser, argv):
args = parser.parse_args(argv) args = parser.parse_args(argv)
if args.version >= 2: if args.version >= 2:
args.function_signature = True args.function_signature = True
return args return args
▲ Show 20 Lines • Show All 1,055 Lines • ▼ Show 20 Lines for p in prefix_list:
func_name, func_name,
"", "",
func_name_separator, func_name_separator,
) )
) )
output_lines.append( output_lines.append(
"%s %s-SAME: %s" % (comment_marker, checkprefix, args_and_sig) "%s %s-SAME: %s" % (comment_marker, checkprefix, args_and_sig)
) )
else: elif not _skip_check_label:
output_lines.append( output_lines.append(
check_label_format check_label_format
% ( % (
checkprefix, checkprefix,
funcdef_attrs_and_ret, funcdef_attrs_and_ret,
func_name, func_name,
args_and_sig, args_and_sig,
func_name_separator, func_name_separator,
▲ Show 20 Lines • Show All 434 Lines • Show Last 20 Lines