This is an archive of the discontinued LLVM Phabricator instance.

Differential D77981

[MC][test] Reorganize macro tests
ClosedPublic

Authored by MaskRay on Apr 12 2020, 2:42 PM.

Details

Reviewers
None
Commits
rG38c271f6f921: [MC][test] Reorganize macro tests
Summary
  • Add locations
  • Use FileCheck --match-full-lines --strict-whitespace
  • Merge related tests
  • Delete redundant tests
  • Improve test coverage

Diff Detail

Unit TestsFailed

TimeTest
140 mslldb-unit.Host/_/HostTests::Unknown Unit Message ("")

Event Timeline

MaskRay created this revision.Apr 12 2020, 2:42 PM
Herald added a project: Restricted Project. · View Herald TranscriptApr 12 2020, 2:42 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript
MaskRay updated this revision to Diff 256882.Apr 12 2020, 2:45 PM

Forgot to add macro-arg.s

MaskRay updated this revision to Diff 256884.Apr 12 2020, 2:52 PM

More tests

MaskRay updated this revision to Diff 256887.Apr 12 2020, 3:14 PM
MaskRay edited the summary of this revision. (Show Details)

Merge tests

This revision was not accepted when it landed; it landed in state Needs Review.Apr 12 2020, 3:29 PM
Closed by commit rG38c271f6f921: [MC][test] Reorganize macro tests (authored by MaskRay). · Explain Why
This revision was automatically updated to reflect the committed changes.
Harbormaster failed remote builds in B52878: Diff 256887!Apr 12 2020, 4:01 PM
Harbormaster failed remote builds in B52874: Diff 256880!
Harbormaster failed remote builds in B52875: Diff 256882!
Harbormaster failed remote builds in B52876: Diff 256884!

Revision Contents

Diff 256884

llvm/test/MC/AsmParser/macro-arg-darwin.s

  • This file was moved from llvm/test/MC/AsmParser/macro-args.s.
// RUN: llvm-mc -triple x86_64-apple-darwin10 %s | FileCheck %s // RUN: llvm-mc -triple x86_64-apple-darwin10 %s | FileCheck %s
.macro GET var,re2g .macro GET var,re2g
movl \var@GOTOFF(%ebx),\re2g movl \var@GOTOFF(%ebx),\re2g
.endm .endm
.macro GET_DEFAULT var, re2g=%ebx, re3g=%ecx .macro GET_DEFAULT var, re2g=%ebx, re3g=%ecx
movl 2(\re2g, \re3g, 2), \var movl 2(\re2g, \re3g, 2), \var
.endm .endm
GET is_sse, %eax GET is_sse, %eax
// CHECK: movl is_sse@GOTOFF(%ebx), %eax // CHECK: movl is_sse@GOTOFF(%ebx), %eax
GET_DEFAULT %ebx, , %edx GET_DEFAULT %ebx, , %edx
// CHECK: movl 2(%ebx,%edx,2), %ebx // CHECK: movl 2(%ebx,%edx,2), %ebx
GET_DEFAULT %ebx, %edx GET_DEFAULT %ebx, %edx
// CHECK: movl 2(%edx,%ecx,2), %ebx // CHECK: movl 2(%edx,%ecx,2), %ebx
.macro bar .macro bar
.long $n .long $n
.endm .endm
bar 1, 2, 3 bar 1, 2, 3
bar bar
// CHECK: .long 3 // CHECK: .long 3
// CHECK: .long 0 // CHECK: .long 0
.macro top .macro top
middle _$0, $1 middle _$0, $1
.endm .endm
.macro middle .macro middle
$0: $0:
.if $n > 1 .if $n > 1
bottom $1 bottom $1
.endif .endif
.endm .endm
.macro bottom .macro bottom
.set fred, $0 .set fred, $0
.endm .endm
.text .text
top foo top foo
top bar, 42 top bar, 42
// CHECK: _foo: // CHECK: _foo:
// CHECK-NOT: fred // CHECK-NOT: fred
// CHECK: _bar // CHECK: _bar
// CHECK-NEXT: .set fred, 42 // CHECK-NEXT: .set fred, 42
.macro foo .macro foo
foo_$0_$1_$2_$3: foo_$0_$1_$2_$3:
nop nop
.endm .endm
foo 1, 2, 3, 4 foo 1, 2, 3, 4
foo 1, , 3, 4 foo 1, , 3, 4
// CHECK: foo_1_2_3_4: // CHECK: foo_1_2_3_4:
// CHECK: foo_1__3_4: // CHECK: foo_1__3_4:

llvm/test/MC/AsmParser/macro-arg-err.s

  • This file was added.
# RUN: not llvm-mc -triple=x86_64 %s 2>&1 | FileCheck %s --match-full-lines --strict-whitespace
# CHECK:{{.*}}.s:[[#@LINE+6]]:14: error: too many positional arguments
# CHECK-NEXT:one_arg 42, 42
# CHECK-NEXT: ^
.macro one_arg bar
.long \bar
.endm
one_arg 42, 42
# CHECK-NEXT:{{.*}}.s:[[#@LINE+6]]:10: error: Wrong number of arguments
# CHECK-NEXT:no_arg 42
# CHECK-NEXT: ^
.macro no_arg
.ascii "$20"
.endm
no_arg 42
.macro double first = -1, second = -1
.long \first
.long \second
.endm
# CHECK-NEXT:{{.*}}.s:[[#@LINE+3]]:14: error: too many positional arguments
# CHECK-NEXT:double 0, 1, 2
# CHECK-NEXT: ^
double 0, 1, 2
# CHECK-NEXT:{{.*}}.s:[[#@LINE+3]]:20: error: cannot mix positional and keyword arguments
# CHECK-NEXT:double second = 1, 2
# CHECK-NEXT: ^
double second = 1, 2
# CHECK-NEXT:{{.*}}.s:[[#@LINE+3]]:8: error: parameter named 'third' does not exist for macro 'double'
# CHECK-NEXT:double third = 0
# CHECK-NEXT: ^
double third = 0

llvm/test/MC/AsmParser/macro-arg.s

  • This file was added.
# RUN: llvm-mc -triple=x86_64 %s | FileCheck %s
.macro empty, cond
.endm
empty ne
# CHECK: .ascii "3 \003"
.macro escape a
.ascii "\a \\a"
.endm
escape 3
.macro double first = -1, second = -1
# begin entry
.long \first
.long \second
# end entry
.endm
# CHECK: .long -1
# CHECK-NEXT: .long -1
double
# CHECK: .long 1
# CHECK-NEXT: .long -1
double 1
# CHECK: .long 2
# CHECK-NEXT: .long 3
double 2, 3
# CHECK: .long -1
# CHECK-NEXT: .long 4
double , 4
# CHECK: .long 5
# CHECK-NEXT: .long 6
double 5, second = 6
# CHECK: .long 7
# CHECK-NEXT: .long -1
double first = 7
# CHECK: .long -1
# CHECK-NEXT: .long 8
double second = 8
# CHECK: .long 10
# CHECK-NEXT: .long 9
double second = 9, first = 10
# CHECK: .long second+11
# CHECK-NEXT: .long -1
double second + 11
# CHECK: .long -1
# CHECK-NEXT: .long second+12
double , second + 12
# CHECK: .long second
# CHECK-NEXT: .long -1
double second
.macro mixed arg0 = 0, arg1 = 1 arg2 = 2, arg3 = 3
# begin entry
.long \arg0
.long \arg1
.long \arg2
.long \arg3
# end entry
.endm
# CHECK: .long 1
# CHECK-NEXT: .long 2
# CHECK-NEXT: .long 3
# CHECK-NEXT: .long 3
mixed 1, 2 3
# CHECK: .long 1
# CHECK-NEXT: .long 2
# CHECK-NEXT: .long 3
# CHECK-NEXT: .long 3
mixed 1 2, 3
# CHECK: .long 1
# CHECK-NEXT: .long 2
# CHECK-NEXT: .long 3
# CHECK-NEXT: .long 4
mixed 1 2, 3 4
.macro ascii3 _a _b _c
.ascii "\_a|\_b|\_c"
.endm
## 3 arguments.
# CHECK: .ascii "a|b|c"
ascii3 a, b, c
# CHECK: .ascii "%1|%2|%3"
ascii3 %1 %2 %3
# CHECK: .ascii "1|2|3"
ascii3 1, 2,3
# CHECK: .ascii "1|2|3"
ascii3 1,2 3
# CHECK: .ascii "1|2|3"
ascii3 1 2, 3
# CHECK: .ascii "x-y|z|1"
ascii3 x - y z 1
## 2 arguments.
# CHECK: .ascii "1|(2 3)|"
ascii3 1, (2 3)
# CHECK: .ascii "1|(2 3)|"
ascii3 1 (2 3)

llvm/test/MC/AsmParser/macro-args.s

  • This file was moved to llvm/test/MC/AsmParser/macro-arg-darwin.s.

llvm/test/MC/AsmParser/macro-def-in-instantiation-darwin.s

  • This file was copied from llvm/test/MC/AsmParser/macro-def-in-instantiation.s.
// RUN: llvm-mc -triple x86_64-apple-darwin10 %s | FileCheck %s // RUN: llvm-mc -triple x86_64-apple-darwin10 %s | FileCheck %s
.macro .make_macro .macro .make_macro
$0 $1 $0 $1
$2 $3 $2 $3
$4 $4
.endmacro .endmacro
.make_macro .macro,.mybyte,.byte,$0,.endmacro .make_macro .macro,.mybyte,.byte,$0,.endmacro
.data .data
// CHECK: .byte 10 // CHECK: .byte 10
.mybyte 10 .mybyte 10
// PR18599
.macro macro_a
.macro macro_b
.byte 10
.macro macro_c
.endm
macro_c
.purgem macro_c
.endm
macro_b
.endm
macro_a
macro_b
// CHECK: .byte 10
// CHECK: .byte 10

llvm/test/MC/AsmParser/macro-def-in-instantiation.s

  • This file was copied to llvm/test/MC/AsmParser/macro-def-in-instantiation-darwin.s.
// RUN: llvm-mc -triple x86_64-apple-darwin10 %s | FileCheck %s # RUN: llvm-mc -triple=x86_64 %s | FileCheck %s
# RUN: llvm-mc -triple=x86_64-apple-darwin10 %s | FileCheck %s
.macro .make_macro # PR18599
$0 $1
$2 $3
$4
.endmacro
.make_macro .macro,.mybyte,.byte,$0,.endmacro
.data
// CHECK: .byte 10
.mybyte 10
// PR18599
.macro macro_a .macro macro_a
.macro macro_b .macro macro_b
.byte 10 .byte 10
.macro macro_c .macro macro_c
.endm .endm
macro_c macro_c
.purgem macro_c .purgem macro_c
.endm .endm
macro_b macro_b
.endm .endm
# CHECK: .byte 10
# CHECK: .byte 10
macro_a macro_a
macro_b macro_b
// CHECK: .byte 10
// CHECK: .byte 10

llvm/test/MC/AsmParser/macro-err1.s

  • This file was deleted.
// RUN: not llvm-mc -triple x86_64-unknown-unknown %s 2> %t
// RUN: FileCheck < %t %s
.macro foo bar
.long \bar
.endm
foo 42, 42
// CHECK: too many positional arguments

llvm/test/MC/AsmParser/macro-qualifier-diagnostics.s

  • This file was deleted.
# RUN: not llvm-mc -triple i386 -o /dev/null %s 2>&1 | FileCheck %s
.macro missing_qualifier parameter:
# CHECK: error: missing parameter qualifier for 'parameter' in macro 'missing_qualifier'
# CHECK: .macro missing_qualifier parameter:
# CHECK: ^
.macro non_identifier_qualifier parameter:0
# CHECK: error: missing parameter qualifier for 'parameter' in macro 'non_identifier_qualifier'
# CHECK: .macro non_identifier_qualifier parameter:0
# CHECK: ^
.macro invalid_qualifier parameter:invalid_qualifier
# CHECK: error: invalid_qualifier is not a valid parameter qualifier for 'parameter' in macro 'invalid_qualifier'
# CHECK: .macro invalid_qualifier parameter:invalid_qualifier
# CHECK: ^
.macro pointless_default parameter:req=default
.endm
# CHECK: warning: pointless default value for required parameter 'parameter' in macro 'pointless_default'
# CHECK: .macro pointless_default parameter:req=default
# CHECK: ^
.macro missing_required_parameter parameter:req
.endm
missing_required_parameter
# CHECK: error: missing value for required parameter 'parameter' in macro 'missing_required_parameter'
# CHECK: missing_required_parameter
# CHECK: ^
.macro missing_second_required_argument first=0 second:req
.endm
missing_second_required_argument
# CHECK: error: missing value for required parameter 'second' in macro 'missing_second_required_argument'
# CHECK: missing_second_required_argument
# CHECK: ^
.macro second_third_required first=0 second:req third:req
.endm
second_third_required 0
# CHECK: error: missing value for required parameter 'second' in macro 'second_third_required'
# CHECK: second_third_required 0
# CHECK: ^
# CHECK: error: missing value for required parameter 'third' in macro 'second_third_required'
# CHECK: second_third_required 0
# CHECK: ^
second_third_required third=3 first=1
# CHECK: error: missing value for required parameter 'second' in macro 'second_third_required'
# CHECK: second_third_required third=3 first=1
# CHECK: ^

llvm/test/MC/AsmParser/macro-qualifier.s

  • This file was moved to llvm/test/MC/AsmParser/macro-required-argument.s.

llvm/test/MC/AsmParser/macro-required-argument-err.s

  • This file was added.
# RUN: not llvm-mc -triple=x86_64 %s -o /dev/null 2>&1 | FileCheck %s --match-full-lines --strict-whitespace
# CHECK:{{.*}}.s:[[#@LINE+3]]:36: error: missing parameter qualifier for 'parameter' in macro 'missing_qualifier'
# CHECK-NEXT:.macro missing_qualifier parameter:
# CHECK-NEXT: ^
.macro missing_qualifier parameter:
# CHECK-NEXT:{{.*}}.s:[[#@LINE+3]]:43: error: missing parameter qualifier for 'parameter' in macro 'non_identifier_qualifier'
# CHECK-NEXT:.macro non_identifier_qualifier parameter:0
# CHECK-NEXT: ^
.macro non_identifier_qualifier parameter:0
# CHECK-NEXT:{{.*}}.s:[[#@LINE+3]]:36: error: invalid_qualifier is not a valid parameter qualifier for 'parameter' in macro 'invalid_qualifier'
# CHECK-NEXT:.macro invalid_qualifier parameter:invalid_qualifier
# CHECK-NEXT: ^
.macro invalid_qualifier parameter:invalid_qualifier
# CHECK-NEXT:{{.*}}.s:[[#@LINE+3]]:40: warning: pointless default value for required parameter 'parameter' in macro 'pointless_default'
# CHECK-NEXT:.macro pointless_default parameter:req=default
# CHECK-NEXT: ^
.macro pointless_default parameter:req=default
.endm
# CHECK-NEXT:{{.*}}.s:[[#@LINE+5]]:17: error: missing value for required parameter 'parameter' in macro 'missing_required'
# CHECK-NEXT:missing_required
# CHECK-NEXT: ^
.macro missing_required parameter:req
.endm
missing_required
# CHECK-NEXT:{{.*}}.s:[[#@LINE+5]]:24: error: missing value for required parameter 'second' in macro 'missing_second_required'
# CHECK-NEXT:missing_second_required
# CHECK-NEXT: ^
.macro missing_second_required first=0 second:req
.endm
missing_second_required
# CHECK-NEXT:{{.*}}.s:[[#@LINE+8]]:24: error: missing value for required parameter 'second' in macro 'second_third_required'
# CHECK-NEXT:second_third_required 0
# CHECK-NEXT: ^
# CHECK-NEXT:{{.*}}.s:[[#@LINE+5]]:24: error: missing value for required parameter 'third' in macro 'second_third_required'
# CHECK-NEXT:second_third_required 0
# CHECK-NEXT: ^
.macro second_third_required first=0 second:req third:req
.endm
second_third_required 0
# CHECK-NEXT:{{.*}}.s:[[#@LINE+3]]:38: error: missing value for required parameter 'second' in macro 'second_third_required'
# CHECK-NEXT:second_third_required third=3 first=1
# CHECK-NEXT: ^
second_third_required third=3 first=1

llvm/test/MC/AsmParser/macro-required-argument.s

  • This file was moved from llvm/test/MC/AsmParser/macro-qualifier.s.
# RUN: llvm-mc -triple i386 -o - %s | FileCheck %s # RUN: llvm-mc -triple i386 -o - %s | FileCheck %s
.macro required parameter:req .macro required parameter:req
.long \parameter .long \parameter
.endm .endm
required 0 required 0
# CHECK: .long 0 # CHECK: .long 0
.macro required_with_default parameter:req=0 .macro required_with_default parameter:req=0
.long \parameter .long \parameter
.endm .endm
required 1 required 1
# CHECK: .long 1 # CHECK: .long 1

llvm/test/MC/AsmParser/macro-unknown-directive.s

  • This file was added.
# RUN: not llvm-mc -triple x86_64 %s 2>&1 | FileCheck %s --match-full-lines --strict-whitespace
# CHECK:<instantiation>:1:1: error: unknown directive
# CHECK-NEXT:.macrobody0
# CHECK-NEXT:^
# CHECK-NEXT:<instantiation>:1:1: note: while in macro instantiation
# CHECK-NEXT:.test0
# CHECK-NEXT:^
# CHECK-NEXT:{{.*}}.s:[[#@LINE+10]]:1: note: while in macro instantiation
# CHECK-NEXT:.test1
# CHECK-NEXT:^
.macro .test0
.macrobody0
.endm
.macro .test1
.test0
.endm
.test1

llvm/test/MC/AsmParser/macros-argument-parsing-diagnostics.s

  • This file was deleted.
# RUN: not llvm-mc -triple i386 -filetype asm -o /dev/null %s 2>&1 | FileCheck %s
.macro double first = -1, second = -1
# begin entry
.long \first
.long \second
# end entry
.endm
double 0, 1, 2
# CHECK: error: too many positional arguments
# CHECK: double 0, 1, 2
# CHECK: ^
double second = 1, 2
# CHECK: error: cannot mix positional and keyword arguments
# CHECK: double second = 1, 2
# CHECK: ^
double third = 0
# CHECK: error: parameter named 'third' does not exist for macro 'double'
# CHECK: double third = 0
# CHECK: ^

llvm/test/MC/AsmParser/macros-argument-parsing.s

  • This file was deleted.
# RUN: llvm-mc -triple i386 -filetype asm -o - %s | FileCheck %s
.macro it, cond
.endm
it ne
.long 1
# CHECK: .long 1
.macro double first = -1, second = -1
# begin entry
.long \first
.long \second
# end entry
.endm
double
# CHECK: .long -1
# CHECK: .long -1
double 1
# CHECK: .long 1
# CHECK: .long -1
double 2, 3
# CHECK: .long 2
# CHECK: .long 3
double , 4
# CHECK: .long -1
# CHECK: .long 4
double 5, second = 6
# CHECK: .long 5
# CHECK: .long 6
double first = 7
# CHECK: .long 7
# CHECK: .long -1
double second = 8
# CHECK: .long -1
# CHECK: .long 8
double second = 9, first = 10
# CHECK: .long 10
# CHECK: .long 9
double second + 11
# CHECK: .long second+11
# CHECK: .long -1
double , second + 12
# CHECK: .long -1
# CHECK: .long second+12
double second
# CHECK: .long second
# CHECK: .long -1
.macro mixed arg0 = 0, arg1 = 1 arg2 = 2, arg3 = 3
# begin entry
.long \arg0
.long \arg1
.long \arg2
.long \arg3
# end entry
.endm
mixed 1, 2 3
# CHECK: .long 1
# CHECK: .long 2
# CHECK: .long 3
# CHECK: .long 3
mixed 1 2, 3
# CHECK: .long 1
# CHECK: .long 2
# CHECK: .long 3
# CHECK: .long 3
mixed 1 2, 3 4
# CHECK: .long 1
# CHECK: .long 2
# CHECK: .long 3
# CHECK: .long 4

llvm/test/MC/AsmParser/macros-gas.s

  • This file was deleted.
// RUN: not llvm-mc -triple i386-linux-gnu %s 2> %t.err | FileCheck %s
// RUN: FileCheck --check-prefix=CHECK-ERRORS %s < %t.err
.macro .test0
.macrobody0
.endm
.macro .test1
.test0
.endm
.test1
// CHECK-ERRORS: <instantiation>:1:1: error: unknown directive
// CHECK-ERRORS-NEXT: macrobody0
// CHECK-ERRORS-NEXT: ^
// CHECK-ERRORS: <instantiation>:1:1: note: while in macro instantiation
// CHECK-ERRORS-NEXT: .test0
// CHECK-ERRORS-NEXT: ^
// CHECK-ERRORS: 11:1: note: while in macro instantiation
// CHECK-ERRORS-NEXT: .test1
// CHECK-ERRORS-NEXT: ^
.macro test2 _a
.byte \_a
.endm
// CHECK: .byte 10
test2 10
.macro test3 _a _b _c
.ascii "\_a \_b \_c \\_c"
.endm
// CHECK: .ascii "1 2 3 \003"
test3 1, 2, 3
// CHECK: .ascii "1 2 3 \003"
test3 1, 2 3
.macro test3_prime _a _b _c
.ascii "\_a \_b \_c"
.endm
// CHECK: .ascii "1 (2 3) "
test3_prime 1, (2 3)
// CHECK: .ascii "1 (2 3) "
test3_prime 1 (2 3)
// CHECK: .ascii "1 2 "
test3_prime 1 2
.macro test5 _a
.globl \_a
.endm
// CHECK: .globl zed1
test5 zed1
.macro test6 $a
.globl \$a
.endm
// CHECK: .globl zed2
test6 zed2
.macro test7 .a
.globl \.a
.endm
// CHECK: .globl zed3
test7 zed3
.macro test8 _a, _b, _c
.ascii "\_a,\_b,\_c"
.endm
.macro test9 _a _b _c
.ascii "\_a \_b \_c"
.endm
// CHECK: .ascii "a,b,c"
test8 a, b, c
// CHECK: .ascii "%1,%2,%3"
test8 %1 %2 %3 #a comment
// CHECK: .ascii "x-y,z,1"
test8 x - y z 1
// CHECK: .ascii "1 2 3"
test9 1, 2,3
// CHECK: .ascii "1,2,3"
test8 1,2 3
// CHECK: .ascii "1,2,3"
test8 1 2, 3
.macro test10
.ascii "$20"
.endm
test10
// CHECK: .ascii "$20"
test10 42
// CHECK-ERRORS: 102:10: error: Wrong number of arguments
// CHECK-ERRORS-NEXT: test10 42
// CHECK-ERRORS-NEXT: ^

llvm/test/MC/AsmParser/macros-off.s

  • This file was added.
# RUN: not llvm-mc -triple x86_64 %s -o /dev/null 2>&1 | FileCheck %s --match-full-lines --strict-whitespace
# RUN: not llvm-mc -triple x86_64-apple-darwin10 %s -o /dev/null 2>&1 | FileCheck %s --match-full-lines --strict-whitespace
.macro .test0
.endmacro
.macros_off
# CHECK:{{.*}}.s:[[#@LINE+3]]:1: error: unknown directive
# CHECK-NEXT:.test0
# CHECK-NEXT:^
.test0
.macros_on
.test0
# CHECK-NEXT:{{.*}}.s:[[#@LINE+3]]:1: error: macro '.test0' is already defined
# CHECK-NEXT:.macro .test0
# CHECK-NEXT:^
.macro .test0
.endmacro
# CHECK-NEXT:{{.*}}.s:[[#@LINE+3]]:10: error: unexpected '.endmacro' in file, no current macro definition
# CHECK-NEXT:.endmacro
# CHECK-NEXT: ^
.endmacro
# CHECK-NEXT:{{.*}}.s:[[#@LINE+3]]:1: error: no matching '.endmacro' in definition
# CHECK-NEXT:.macro dummy
# CHECK-NEXT:^
.macro dummy

llvm/test/MC/AsmParser/macros-parsing.s

  • This file was deleted.
// RUN: not llvm-mc -triple x86_64-apple-darwin10 %s 2> %t.err
// RUN: FileCheck --check-prefix=CHECK-ERRORS %s < %t.err
.macro .test0
.endmacro
.macros_off
// CHECK-ERRORS: 9:1: error: unknown directive
.test0
.macros_on
.test0
// CHECK-ERRORS: macro '.test0' is already defined
.macro .test0
.endmacro
// CHECK-ERRORS: unexpected '.endmacro' in file
.endmacro
// CHECK-ERRORS: no matching '.endmacro' in definition
.macro dummy
llvm/test/MC/AsmParser/macros-off.s