This is an archive of the discontinued LLVM Phabricator instance.

[HIP] Fix ordering of device-lib linking
ClosedPublic

Authored by ashi1 on Jun 27 2018, 12:15 PM.

Download Raw Diff

Details

Reviewers

yaxunl
b-sumner

Commits

rG02151cacca5c: [HIP] Fix ordering of device-libs linking
rL335774: [HIP] Fix ordering of device-libs linking
rC335774: [HIP] Fix ordering of device-libs linking

Summary

Should link the bitcodes with caller functions before callee functions.

Diff Detail

Repository: rC Clang

Event Timeline

ashi1 created this revision.Jun 27 2018, 12:15 PM

Herald added a subscriber: cfe-commits. · View Herald TranscriptJun 27 2018, 12:15 PM

Thanks, looks good.

Please add a lit test.

Updated diff with a lit test.

LGTM. Thanks!

This revision is now accepted and ready to land.Jun 27 2018, 12:54 PM

Closed by commit rC335774: [HIP] Fix ordering of device-libs linking (authored by aaronenyeshi). · Explain WhyJun 27 2018, 12:56 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents

Path

Size

lib/

Driver/

ToolChains/

HIP.cpp

2 lines

test/

Driver/

hip-device-libs.hip

1 line

Diff 153158

lib/Driver/ToolChains/HIP.cpp

Show First 20 Lines • Show All 76 Lines • ▼ Show 20 Lines	if (BCLibs.empty()) {

llvm::StringRef FlushDenormalControlBC;		llvm::StringRef FlushDenormalControlBC;
if (Args.hasArg(options::OPT_fcuda_flush_denormals_to_zero))		if (Args.hasArg(options::OPT_fcuda_flush_denormals_to_zero))
FlushDenormalControlBC = "oclc_daz_opt_on.amdgcn.bc";		FlushDenormalControlBC = "oclc_daz_opt_on.amdgcn.bc";
else		else
FlushDenormalControlBC = "oclc_daz_opt_off.amdgcn.bc";		FlushDenormalControlBC = "oclc_daz_opt_off.amdgcn.bc";

BCLibs.append({"opencl.amdgcn.bc",		BCLibs.append({"opencl.amdgcn.bc",
"ockl.amdgcn.bc", "irif.amdgcn.bc", "ocml.amdgcn.bc",		"ocml.amdgcn.bc", "ockl.amdgcn.bc", "irif.amdgcn.bc",
"oclc_finite_only_off.amdgcn.bc",		"oclc_finite_only_off.amdgcn.bc",
FlushDenormalControlBC,		FlushDenormalControlBC,
"oclc_correctly_rounded_sqrt_on.amdgcn.bc",		"oclc_correctly_rounded_sqrt_on.amdgcn.bc",
"oclc_unsafe_math_off.amdgcn.bc", ISAVerBC});		"oclc_unsafe_math_off.amdgcn.bc", ISAVerBC});
}		}
for (auto Lib : BCLibs)		for (auto Lib : BCLibs)
addBCLib(C, Args, CmdArgs, LibraryPaths, Lib);		addBCLib(C, Args, CmdArgs, LibraryPaths, Lib);

▲ Show 20 Lines • Show All 255 Lines • Show Last 20 Lines

test/Driver/hip-device-libs.hip

	Show All 15 Lines
	// RUN: %clang -### -target x86_64-linux-gnu \			// RUN: %clang -### -target x86_64-linux-gnu \
	// RUN: -x hip --cuda-gpu-arch=gfx900 \			// RUN: -x hip --cuda-gpu-arch=gfx900 \
	// RUN: --hip-device-lib-path=%S/Inputs/hip_dev_lib \			// RUN: --hip-device-lib-path=%S/Inputs/hip_dev_lib \
	// RUN: %S/Inputs/hip_multiple_inputs/b.hip \			// RUN: %S/Inputs/hip_multiple_inputs/b.hip \
	// RUN: 2>&1 \| FileCheck %s --check-prefixes=COM,NOFLUSHD			// RUN: 2>&1 \| FileCheck %s --check-prefixes=COM,NOFLUSHD


	// COM: [[LLVM_LINK:"*.llvm-link"]]			// COM: [[LLVM_LINK:"*.llvm-link"]]
				// COM-SAME: {{.}} "{{.}}ocml.amdgcn.bc" "{{.}}ockl.amdgcn.bc" "{{.}}irif.amdgcn.bc"
	// FLUSHD-SAME: {{.}} "{{.}}oclc_daz_opt_on.amdgcn.bc"			// FLUSHD-SAME: {{.}} "{{.}}oclc_daz_opt_on.amdgcn.bc"
	// NOFLUSHD-SAME: {{.}} "{{.}}oclc_daz_opt_off.amdgcn.bc"			// NOFLUSHD-SAME: {{.}} "{{.}}oclc_daz_opt_off.amdgcn.bc"
	// COM-SAME: {{.}} "-o" "{{.}}-gfx900-linked-{{.*bc}}"			// COM-SAME: {{.}} "-o" "{{.}}-gfx900-linked-{{.*bc}}"