This is an archive of the discontinued LLVM Phabricator instance.

Differential D95276

[External][SPEC2000] Add -Wl,-zmultidef linker option.
ClosedPublic

Authored by Meinersbur on Jan 22 2021, 4:39 PM.

Details

Reviewers
naromero77
Commits
rTb14299f31a67: [External][SPEC2000] Add -Wl,-zmultidef linker option.
Summary

The SPEC CPU 2000 benchmarks 186.crafty and 300.twolf have symbols defined in multiple source file. Add the -zmultidef option to the linker for compatibility with older linkers.

Diff Detail

Event Timeline

Meinersbur created this revision.Jan 22 2021, 4:39 PM
Herald added a subscriber: mgorny. · View Herald TranscriptJan 22 2021, 4:39 PM
Meinersbur requested review of this revision.Jan 22 2021, 4:39 PM
Harbormaster completed remote builds in B86370: Diff 318681.Jan 22 2021, 4:39 PM
Meinersbur retitled this revision from [External] Add -Wl,-zmultidef linker option. to [External][SPEC2000] Add -Wl,-zmultidef linker option..Jan 22 2021, 8:59 PM
naromero77 added a comment.Jan 22 2021, 9:02 PM

LGTM

naromero77 accepted this revision.Jan 22 2021, 9:02 PM
This revision is now accepted and ready to land.Jan 22 2021, 9:02 PM
Closed by commit rTb14299f31a67: [External][SPEC2000] Add -Wl,-zmultidef linker option. (authored by Meinersbur). · Explain WhyJan 22 2021, 10:45 PM
This revision was automatically updated to reflect the committed changes.
Meinersbur added a commit: rTb14299f31a67: [External][SPEC2000] Add -Wl,-zmultidef linker option..
fhahn added a subscriber: fhahn.Jan 26 2021, 7:29 AM
fhahn added inline comments.
External/SPEC/CINT2000/186.crafty/CMakeLists.txt
29

Do we need to set this conditionally? I think this breaks builds in macOS with newer versions of ld, which does not support -zmuldefs

Meinersbur added inline comments.Jan 26 2021, 11:56 AM
External/SPEC/CINT2000/186.crafty/CMakeLists.txt
29

This is probably not because it a new version, but because it is not GNU ld.

Does the macOS linker (I assume lld?) just ignore multiple definitions by default?

fhahn added inline comments.Jan 26 2021, 12:16 PM
External/SPEC/CINT2000/186.crafty/CMakeLists.txt
29

I am not sure I am afraid, but the benchmarks work fine without the flag and the flag causes an unsupported option error

Meinersbur mentioned this in D95506: [External][SPEC2000] Introspect -zmuldefs linker option before use..Jan 26 2021, 9:35 PM
Meinersbur mentioned this in rTcc119721bf3e: [External][SPEC2000] Introspect -zmuldefs linker option before use..Jan 27 2021, 8:01 AM
Meinersbur added a reverting change: D98260: [test-suite][SPEC2000] Use -fcommon instead of -zmultidef..Mar 9 2021, 7:06 AM
Meinersbur added a reverting change: rT1cfa2ce3f439: [test-suite][SPEC2000] Use -fcommon instead of -zmultidef..Mar 9 2021, 12:15 PM

Revision Contents

PathSize
External/
SPEC/
CINT2000/
186.crafty/
2 lines
300.twolf/
1 line

Diff 318681

External/SPEC/CINT2000/186.crafty/CMakeLists.txt

Show All 20 Lines
if(LONG64_TYPE_SIZE EQUAL 8) if(LONG64_TYPE_SIZE EQUAL 8)
list(APPEND CPPFLAGS -DLONG_HAS_64BITS) list(APPEND CPPFLAGS -DLONG_HAS_64BITS)
endif() endif()
check_type_size("long long" LONG_LONG_TYPE_SIZE BUILTIN_TYPES_ONLY) check_type_size("long long" LONG_LONG_TYPE_SIZE BUILTIN_TYPES_ONLY)
if(LONG_LONG_TYPE_SIZE GREATER 7) if(LONG_LONG_TYPE_SIZE GREATER 7)
list(APPEND CPPFLAGS -DHAS_LONGLONG) list(APPEND CPPFLAGS -DHAS_LONGLONG)
endif() endif()
list(APPEND LDFLAGS -Wl,-zmuldefs)
fhahnUnsubmitted
Not Done
ReplyInline Actions

Do we need to set this conditionally? I think this breaks builds in macOS with newer versions of ld, which does not support -zmuldefs

fhahn: Do we need to set this conditionally? I think this breaks builds in macOS with newer versions…
MeinersburAuthorUnsubmitted
Done
ReplyInline Actions

This is probably not because it a new version, but because it is not GNU ld.

Does the macOS linker (I assume lld?) just ignore multiple definitions by default?

Meinersbur: This is probably not because it a new version, but because it is not GNU ld. Does the macOS…
fhahnUnsubmitted
Not Done
ReplyInline Actions

I am not sure I am afraid, but the benchmarks work fine without the flag and the flag causes an unsupported option error

fhahn: I am not sure I am afraid, but the benchmarks work fine without the flag and the flag causes an…
set(SourceNames set(SourceNames
attacks.c attacks.c
boolean.c boolean.c
draw.c draw.c
drawn.c drawn.c
edit.c edit.c
enprise.c enprise.c
evaluate.c evaluate.c
▲ Show 20 Lines • Show All 52 Lines • Show Last 20 Lines

External/SPEC/CINT2000/300.twolf/CMakeLists.txt

list(APPEND CPPFLAGS -DHAVE_SIGNED_CHAR) list(APPEND CPPFLAGS -DHAVE_SIGNED_CHAR)
list(APPEND LDFLAGS -lm) list(APPEND LDFLAGS -lm)
list(APPEND LDFLAGS -Wl,-zmuldefs)
list(APPEND CFLAGS -Wno-return-type) list(APPEND CFLAGS -Wno-return-type)
macro(test_input run_type) macro(test_input run_type)
llvm_test_run(RUN_TYPE ${run_type} llvm_test_run(RUN_TYPE ${run_type}
WORKDIR ${CMAKE_CURRENT_BINARY_DIR}/data/${run_type}/input WORKDIR ${CMAKE_CURRENT_BINARY_DIR}/data/${run_type}/input
${run_type} > ${run_type}.stdout ${run_type} > ${run_type}.stdout
) )
foreach(file IN ITEMS ${run_type}.twf ${run_type}.pl2 ${run_type}.sav ${run_type}.pl1 ${run_type}.pl1 ${run_type}.pin ${run_type}.stdout ${run_type}.sv2 ${run_type}.out) foreach(file IN ITEMS ${run_type}.twf ${run_type}.pl2 ${run_type}.sav ${run_type}.pl1 ${run_type}.pl1 ${run_type}.pin ${run_type}.stdout ${run_type}.sv2 ${run_type}.out)
Show All 12 Lines