This is an archive of the discontinued LLVM Phabricator instance.

Differential D37708

Simplify MinGW test.
ClosedPublic

Authored by ruiu on Sep 11 2017, 1:52 PM.

Details

Reviewers
mstorsjo
Commits
rGa54ed0a4074d: Simplify MinGW test.
rLLD313045: Simplify MinGW test.
rL313045: Simplify MinGW test.
Summary

Simplify MinGW test.

Diff Detail

Event Timeline

ruiu created this revision.Sep 11 2017, 1:52 PM
Herald added a subscriber: javed.absar. · View Herald TranscriptSep 11 2017, 1:52 PM
Harbormaster completed remote builds in B10098: Diff 114677.Sep 11 2017, 1:55 PM
mstorsjo added inline comments.Sep 11 2017, 2:03 PM
lld/test/MinGW/driver.s
2–3

Is there any value in actually assembling an input object for this test, when we actually don't do any real linking here?

33

This test seems to have been mixed up, and I can't find the actual test for the stack option.

ruiu updated this revision to Diff 114685.Sep 11 2017, 2:04 PM
  • cover all options
mstorsjo added inline comments.Sep 11 2017, 2:04 PM
lld/test/MinGW/driver.s
8

I think this could use a check for the image base alternate name, which has got a i386 specific case.

ruiu added a comment.Sep 11 2017, 2:07 PM

We need to pass a path to an existing file, so I passed an object file to each test, but it doesn't have to be an actual object file. In the updated test case, /dev/null is passed instead.

lld/test/MinGW/driver.s
33

Fixed.

ruiu updated this revision to Diff 114688.Sep 11 2017, 2:07 PM
  • Address review comments.
ruiu updated this revision to Diff 114709.Sep 11 2017, 2:49 PM
  • test -mllvm option.
Herald added a subscriber: mehdi_amini. · View Herald TranscriptSep 11 2017, 2:49 PM
Harbormaster completed remote builds in B10106: Diff 114709.Sep 11 2017, 2:49 PM
martell added a subscriber: martell.Sep 11 2017, 2:59 PM
mstorsjo accepted this revision.Sep 11 2017, 10:23 PM

LGTM

This revision is now accepted and ready to land.Sep 11 2017, 10:23 PM
Closed by commit rL313045: Simplify MinGW test. (authored by ruiu). · Explain WhySep 12 2017, 9:30 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

Diff 114685

lld/test/MinGW/Inputs/imagebase-aarch64.yaml

  • This file was deleted.
--- !COFF
header:
Machine: IMAGE_FILE_MACHINE_ARM64
Characteristics: [ ]
sections:
- Name: .text
Characteristics: [ IMAGE_SCN_CNT_CODE, IMAGE_SCN_MEM_EXECUTE, IMAGE_SCN_MEM_READ ]
Alignment: 16
SectionData: 31C0C3666666662E0F1F84000000000031C0C3666666662E0F1F840000000000488D0500000000C3
symbols:
- Name: .text
Value: 0
SectionNumber: 1
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_NULL
StorageClass: IMAGE_SYM_CLASS_STATIC
SectionDefinition:
Length: 40
NumberOfRelocations: 1
NumberOfLinenumbers: 0
CheckSum: 3930888477
Number: 1
- Name: mainCRTStartup
Value: 0
SectionNumber: 1
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_FUNCTION
StorageClass: IMAGE_SYM_CLASS_EXTERNAL
- Name: main
Value: 16
SectionNumber: 1
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_FUNCTION
StorageClass: IMAGE_SYM_CLASS_EXTERNAL
- Name: func
Value: 32
SectionNumber: 1
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_FUNCTION
StorageClass: IMAGE_SYM_CLASS_EXTERNAL
- Name: __ImageBase
Value: 0
SectionNumber: 0
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_NULL
StorageClass: IMAGE_SYM_CLASS_EXTERNAL
...

lld/test/MinGW/Inputs/imagebase-arm.yaml

  • This file was deleted.
--- !COFF
header:
Machine: IMAGE_FILE_MACHINE_ARMNT
Characteristics: [ ]
sections:
- Name: .text
Characteristics: [ IMAGE_SCN_CNT_CODE, IMAGE_SCN_MEM_EXECUTE, IMAGE_SCN_MEM_READ ]
Alignment: 16
SectionData: 31C0C3666666662E0F1F84000000000031C0C3666666662E0F1F840000000000B800000000C3
symbols:
- Name: .text
Value: 0
SectionNumber: 1
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_NULL
StorageClass: IMAGE_SYM_CLASS_STATIC
SectionDefinition:
Length: 38
NumberOfRelocations: 1
NumberOfLinenumbers: 0
CheckSum: 3189961473
Number: 1
- Name: mainCRTStartup
Value: 0
SectionNumber: 1
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_FUNCTION
StorageClass: IMAGE_SYM_CLASS_EXTERNAL
- Name: main
Value: 16
SectionNumber: 1
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_FUNCTION
StorageClass: IMAGE_SYM_CLASS_EXTERNAL
- Name: func
Value: 32
SectionNumber: 1
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_FUNCTION
StorageClass: IMAGE_SYM_CLASS_EXTERNAL
- Name: __ImageBase
Value: 0
SectionNumber: 0
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_NULL
StorageClass: IMAGE_SYM_CLASS_EXTERNAL
...

lld/test/MinGW/Inputs/imagebase-i386.yaml

  • This file was deleted.
--- !COFF
header:
Machine: IMAGE_FILE_MACHINE_I386
Characteristics: [ ]
sections:
- Name: .text
Characteristics: [ IMAGE_SCN_CNT_CODE, IMAGE_SCN_MEM_EXECUTE, IMAGE_SCN_MEM_READ ]
Alignment: 16
SectionData: 31C0C3666666662E0F1F84000000000031C0C3666666662E0F1F840000000000B800000000C3
symbols:
- Name: .text
Value: 0
SectionNumber: 1
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_NULL
StorageClass: IMAGE_SYM_CLASS_STATIC
SectionDefinition:
Length: 38
NumberOfRelocations: 1
NumberOfLinenumbers: 0
CheckSum: 3189961473
Number: 1
- Name: _mainCRTStartup
Value: 0
SectionNumber: 1
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_FUNCTION
StorageClass: IMAGE_SYM_CLASS_EXTERNAL
- Name: _main
Value: 16
SectionNumber: 1
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_FUNCTION
StorageClass: IMAGE_SYM_CLASS_EXTERNAL
- Name: _func
Value: 32
SectionNumber: 1
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_FUNCTION
StorageClass: IMAGE_SYM_CLASS_EXTERNAL
- Name: __image_base__
Value: 0
SectionNumber: 0
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_NULL
StorageClass: IMAGE_SYM_CLASS_EXTERNAL
...

lld/test/MinGW/Inputs/imagebase-x86_64.yaml

  • This file was deleted.
--- !COFF
header:
Machine: IMAGE_FILE_MACHINE_AMD64
Characteristics: [ ]
sections:
- Name: .text
Characteristics: [ IMAGE_SCN_CNT_CODE, IMAGE_SCN_MEM_EXECUTE, IMAGE_SCN_MEM_READ ]
Alignment: 16
SectionData: 31C0C3666666662E0F1F84000000000031C0C3666666662E0F1F840000000000488D0500000000C3
symbols:
- Name: .text
Value: 0
SectionNumber: 1
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_NULL
StorageClass: IMAGE_SYM_CLASS_STATIC
SectionDefinition:
Length: 40
NumberOfRelocations: 1
NumberOfLinenumbers: 0
CheckSum: 3930888477
Number: 1
- Name: mainCRTStartup
Value: 0
SectionNumber: 1
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_FUNCTION
StorageClass: IMAGE_SYM_CLASS_EXTERNAL
- Name: main
Value: 16
SectionNumber: 1
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_FUNCTION
StorageClass: IMAGE_SYM_CLASS_EXTERNAL
- Name: func
Value: 32
SectionNumber: 1
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_FUNCTION
StorageClass: IMAGE_SYM_CLASS_EXTERNAL
- Name: __image_base__
Value: 0
SectionNumber: 0
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_NULL
StorageClass: IMAGE_SYM_CLASS_EXTERNAL
...

lld/test/MinGW/driver.s

# REQEUIRES: x86 # REQEUIRES: x86
# RUN: rm -f a.exe a.dll
# RUN: llvm-mc -triple=x86_64-windows-msvc %s -filetype=obj -o %t.obj # RUN: llvm-mc -triple=x86_64-windows-msvc %s -filetype=obj -o %t.obj
# RUN: ld.lld -m i386pep --entry main %t.obj
# RUN: llvm-readobj a.exe | FileCheck %s
# RUN: ld.lld -m i386pep -shared --entry main %t.obj
# RUN: llvm-readobj a.dll | FileCheck %s
# RUN: ld.lld -m i386pep -e main %t.obj -o %t.exe
# RUN: llvm-readobj %t.exe | FileCheck %s
# CHECK: File:
# RUN: ld.lld -m i386pep -e main %t.obj -o %t.exe -verbose -### | FileCheck %s -check-prefix CHECK-VERBOSE
# CHECK-VERBOSE: lld-link -entry:main
# CHECK-VERBOSE-SAME: -machine:x64 -alternatename:__image_base__=__ImageBase
# CHECK-VERBOSE-SAME: -verbose
# RUN: ld.lld -m i386pep --entry main %t.obj -o %t.exe --subsystem console
# RUN: llvm-readobj -file-headers %t.exe | FileCheck %s -check-prefix CHECK-CONSOLE
# CHECK-CONSOLE: Subsystem: IMAGE_SUBSYSTEM_WINDOWS_CUI (0x3)
# RUN: ld.lld -m i386pep --entry main %t.obj -o %t.exe --subsystem windows
# RUN: llvm-readobj -file-headers %t.exe | FileCheck %s -check-prefix CHECK-WINDOWS
# CHECK-WINDOWS: Subsystem: IMAGE_SUBSYSTEM_WINDOWS_GUI (0x2)
# RUN: ld.lld -m i386pep --entry main %t.obj -o %t.exe --stack 4194304,8192
# RUN: llvm-readobj -file-headers %t.exe | FileCheck %s -check-prefix CHECK-STACK
# CHECK-STACK: SizeOfStackReserve: 4194304
# CHECK-STACK: SizeOfStackCommit: 8192
# RUN: yaml2obj < %p/Inputs/imagebase-i386.yaml > %t.obj
# RUN: ld.lld -m i386pe %t.obj -o %t.exe
# RUN: llvm-readobj -file-headers %t.exe | FileCheck %s -check-prefix CHECK-I386
# CHECK-I386: Machine: IMAGE_FILE_MACHINE_I386
# RUN: yaml2obj < %p/Inputs/imagebase-x86_64.yaml > %t.obj
# RUN: ld.lld -m i386pep %t.obj -o %t.exe
# RUN: llvm-readobj -file-headers %t.exe | FileCheck %s -check-prefix CHECK-AMD64
# CHECK-AMD64: Machine: IMAGE_FILE_MACHINE_AMD64
# RUN: yaml2obj < %p/Inputs/imagebase-arm.yaml > %t.obj
# RUN: ld.lld -m thumb2pe %t.obj -o %t.exe
# RUN: llvm-readobj -file-headers %t.exe | FileCheck %s -check-prefix CHECK-ARMNT
# CHECK-ARMNT: Machine: IMAGE_FILE_MACHINE_ARMNT
# RUN: yaml2obj < %p/Inputs/imagebase-aarch64.yaml > %t.obj
# RUN: ld.lld -m arm64pe %t.obj -o %t.exe
# RUN: llvm-readobj -file-headers %t.exe | FileCheck %s -check-prefix CHECK-ARM64
# CHECK-ARM64: Machine: IMAGE_FILE_MACHINE_ARM64
# RUN: yaml2obj < %p/../COFF/Inputs/export.yaml > %t.obj
# RUN: ld.lld -m i386pep --shared %t.obj -o %t.dll --out-implib %t.lib
# RUN: llvm-readobj %t.lib | FileCheck %s -check-prefix CHECK-IMPLIB
# CHECK-IMPLIB: Symbol: __imp_exportfn3
# CHECK-IMPLIB: Symbol: exportfn3
mstorsjoUnsubmitted
Not Done
ReplyInline Actions

Is there any value in actually assembling an input object for this test, when we actually don't do any real linking here?

mstorsjo: Is there any value in actually assembling an input object for this test, when we actually don't…
.global main # RUN: ld.lld -### %t.obj -m i386pe | FileCheck -check-prefix=I386PE %s
# I386PE: -out:a.exe
# I386PE-SAME: -machine:x86
# I386PE-SAME: -alternatename:__image_base__=___ImageBase
mstorsjoUnsubmitted
Not Done
ReplyInline Actions

I think this could use a check for the image base alternate name, which has got a i386 specific case.

mstorsjo: I think this could use a check for the image base alternate name, which has got a i386 specific…
# RUN: ld.lld -### %t.obj -m i386pep | FileCheck -check-prefix=I386PEP %s
# I386PEP: -out:a.exe
# I386PEP-SAME: -machine:x64
# I386PEP-SAME: -alternatename:__image_base__=__ImageBase
# RUN: ld.lld -### %t.obj -m thumb2pe | FileCheck -check-prefix=THUMB2PE %s
# THUMB2PE: -out:a.exe
# THUMB2PE-SAME: -machine:arm
# THUMB2PE-SAME: -alternatename:__image_base__=__ImageBase
# RUN: ld.lld -### %t.obj -m arm64pe | FileCheck -check-prefix=ARM64PE %s
# ARM64PE: -out:a.exe
# ARM64PE-SAME: -machine:arm64
# ARM64PE-SAME: -alternatename:__image_base__=__ImageBase
# RUN: ld.lld -### %t.obj -m i386pep -shared | FileCheck -check-prefix=SHARED %s
# SHARED: -out:a.dll
# SHARED-SAME: -dll
# RUN: ld.lld -### %t.obj -m i386pep -o foo.exe | FileCheck -check-prefix=OUT %s
# OUT: -out:foo.exe
# RUN: ld.lld -### %t.obj -m i386pep -e mainCRTStartup | FileCheck -check-prefix=ENTRY %s
# RUN: ld.lld -### %t.obj -m i386pep --entry mainCRTStartup | FileCheck -check-prefix=ENTRY %s
# ENTRY: -entry:mainCRTStartup
mstorsjoUnsubmitted
Not Done
ReplyInline Actions

This test seems to have been mixed up, and I can't find the actual test for the stack option.

mstorsjo: This test seems to have been mixed up, and I can't find the actual test for the stack option.
ruiuAuthorUnsubmitted
Not Done
ReplyInline Actions

Fixed.

ruiu: Fixed.
# RUN: ld.lld -### %t.obj -m i386pep --subsystem console | FileCheck -check-prefix=SUBSYSTEM %s
# SUBSYSTEM: -subsystem:console
# RUN: ld.lld -### %t.obj -m i386pep --out-implib foo | FileCheck -check-prefix=STACK %s
# STACK: -implib:foo
# RUN: ld.lld -### %t.obj -m i386pep --verbose foo | FileCheck -check-prefix=VERBOSE %s
# VERBOSE: -verbose
.global main, mainCRTStartup, _DllMainCRTStartup
.text .text
main: main:
ret ret
mainCRTStartup:
ret
_DllMainCRTStartup:
ret
lld/test/MinGW/Inputs/imagebase-i386.yaml