This is an archive of the discontinued LLVM Phabricator instance.

Differential D118738

[BOLT] Add ld.lld substitution
ClosedPublic

Authored by Amir on Feb 1 2022, 1:56 PM.

Download Raw Diff

Details

Reviewers

maksfb
rafauler
yota9

Commits

rG03f014c9ae38: [BOLT] Add ld.lld substitution

Summary

Register ld.lld substition (tests were failing)

Diff Detail

Repository: rG LLVM Github Monorepo

Event Timeline

Amir created this revision.Feb 1 2022, 1:56 PM

Herald added a subscriber: ayermolo. · View Herald TranscriptFeb 1 2022, 1:56 PM

Amir requested review of this revision.Feb 1 2022, 1:56 PM

Herald added a project: Restricted Project. · View Herald TranscriptFeb 1 2022, 1:56 PM

Herald added a subscriber: llvm-commits. · View Herald Transcript

Harbormaster completed remote builds in B147019: Diff 405095.Feb 1 2022, 2:07 PM

Use ld.lld instead of lld

yota9 accepted this revision.Feb 1 2022, 2:24 PM

This revision is now accepted and ready to land.Feb 1 2022, 2:24 PM

Harbormaster completed remote builds in B147025: Diff 405101.Feb 1 2022, 2:32 PM

It seems to be that

llvm_config.use_lld()

Should be enough to satisfy the test system :)

This revision now requires changes to proceed.Feb 3 2022, 2:45 PM

In D118738#3295219, @yota9 wrote:
It seems to be that
llvm_config.use_lld()
Should be enough to satisfy the test system :)

I've removed that invocation (use_lld) as it wasn't checking the env variable.

Rebase

Harbormaster completed remote builds in B147732: Diff 406123.Feb 4 2022, 4:12 PM

AFAIU The build failure is still related to this change:

/var/lib/buildkite-agent/builds/llvm-project/build/tools/bolt/test/X86/Output/gdbindex.test.script: line 3: /usr/bin/ld.lld: No such file or directory

In D118738#3298324, @yota9 wrote:
AFAIU The build failure is still related to this change:
/var/lib/buildkite-agent/builds/llvm-project/build/tools/bolt/test/X86/Output/gdbindex.test.script: line 3: /usr/bin/ld.lld: No such file or directory

Right. It's likely no such file actually exists and the tool has a suffix (/usr/bin/ld.lld-13).

https://github.com/google/llvm-premerge-checks/pull/385

I see, thanks!

This revision is now accepted and ready to land.Feb 4 2022, 4:43 PM

Rebase

Harbormaster completed remote builds in B147775: Diff 406196.Feb 5 2022, 10:38 AM

Closed by commit rG03f014c9ae38: [BOLT] Add ld.lld substitution (authored by Amir). · Explain WhyFeb 7 2022, 8:59 PM

This revision was automatically updated to reflect the committed changes.

Amir added a commit: rG03f014c9ae38: [BOLT] Add ld.lld substitution.

Revision Contents

Path

Size

bolt/

test/

7 lines

Diff 406698

bolt/test/lit.cfg.py

	Show First 20 Lines • Show All 50 Lines • ▼ Show 20 Lines		lit_config.warning('Setting a timeout per test not supported. ' + errormsg
	+ ' Some tests will be skipped.')			+ ' Some tests will be skipped.')

	if config.bolt_enable_runtime:			if config.bolt_enable_runtime:
	config.available_features.add("bolt-runtime")			config.available_features.add("bolt-runtime")

	llvm_config.use_default_substitutions()			llvm_config.use_default_substitutions()

	llvm_config.config.environment['CLANG'] = config.bolt_clang			llvm_config.config.environment['CLANG'] = config.bolt_clang
	llvm_config.config.environment['LLD'] = config.bolt_lld
	llvm_config.use_clang()			llvm_config.use_clang()
	llvm_config.use_llvm_tool('lld', required=True, search_env='LLD')
				llvm_config.config.environment['LD_LLD'] = config.bolt_lld
				ld_lld = llvm_config.use_llvm_tool('ld.lld', required=True, search_env='LD_LLD')
				llvm_config.config.available_features.add('ld.lld')
				llvm_config.add_tool_substitutions([ToolSubst(r'ld\.lld', command=ld_lld)])

	config.substitutions.append(('%cflags', '-no-pie -gdwarf-4'))			config.substitutions.append(('%cflags', '-no-pie -gdwarf-4'))
	config.substitutions.append(('%cxxflags', '-no-pie -gdwarf-4'))			config.substitutions.append(('%cxxflags', '-no-pie -gdwarf-4'))

	link_fdata_cmd = os.path.join(config.test_source_root, 'link_fdata.py')			link_fdata_cmd = os.path.join(config.test_source_root, 'link_fdata.py')

	tool_dirs = [config.llvm_tools_dir,			tool_dirs = [config.llvm_tools_dir,
	config.test_source_root]			config.test_source_root]
	Show All 32 Lines