This is an archive of the discontinued LLVM Phabricator instance.

[HIP][DRIVER][OFFLOAD] Do not unbundle unsupported file types
ClosedPublic

Authored by ashi1 on Jan 4 2019, 8:40 AM.

Download Raw Diff

Details

Reviewers

Commits

rG0743cda6d4d5: [HIP][DRIVER][OFFLOAD] Do not unbundle unsupported file types
rL350425: [HIP][DRIVER][OFFLOAD] Do not unbundle unsupported file types
rC350425: [HIP][DRIVER][OFFLOAD] Do not unbundle unsupported file types

Summary

The offload bundler action should not unbundle the input file types that does not match the action type. This fixes an issue where .so files are unbundled when the action type is object files.

Diff Detail

Repository: rL LLVM

Event Timeline

ashi1 created this revision.Jan 4 2019, 8:40 AM

Herald added a subscriber: cfe-commits. · View Herald TranscriptJan 4 2019, 8:41 AM

ashi1 added a subscriber: Restricted Project.Jan 4 2019, 8:41 AM

LGTM. Can you rename the lit test as hip-link-shared-library.hip? That is more meaningful. Thanks.

This revision is now accepted and ready to land.Jan 4 2019, 11:04 AM

Closed by commit rL350426: [HIP][DRIVER][OFFLOAD] Do not unbundle unsupported file types (authored by aaronenyeshi). · Explain WhyJan 4 2019, 11:13 AM

This revision was automatically updated to reflect the committed changes.

Herald added a subscriber: llvm-commits. · View Herald TranscriptJan 4 2019, 11:13 AM

ashi1 added commits: rC350425: [HIP][DRIVER][OFFLOAD] Do not unbundle unsupported file types, rL350425: [HIP][DRIVER][OFFLOAD] Do not unbundle unsupported file types.Jan 4 2019, 11:15 AM

ashi1 removed commits: rC350426: [HIP][DRIVER][OFFLOAD] Do not unbundle unsupported file types, rL350426: [HIP][DRIVER][OFFLOAD] Do not unbundle unsupported file types.

I've commit the changes, but forgot to tag the proper Diff link in the commit message. I just updated it.

Revision Contents

Path

Size

cfe/

trunk/

test/

Driver/

hip-link-shared-library.hip

1 line

Diff 180288

cfe/trunk/test/Driver/hip-link-shared-library.hip

	// RUN: touch %t.o			// RUN: touch %t.o
	// RUN: %clang --hip-link -ccc-print-bindings -target x86_64-linux-gnu \			// RUN: %clang --hip-link -ccc-print-bindings -target x86_64-linux-gnu \
	// RUN: --cuda-gpu-arch=gfx803 --cuda-gpu-arch=gfx900 %t.o %S/Inputs/in.so \			// RUN: --cuda-gpu-arch=gfx803 --cuda-gpu-arch=gfx900 %t.o %S/Inputs/in.so \
	// RUN: 2>&1 \| FileCheck %s			// RUN: 2>&1 \| FileCheck %s

	// CHECK: # "amdgcn-amd-amdhsa" - "offload bundler", inputs: ["[[IN:.o]]"], outputs: ["[[OBJ1:.o]]", "[[OBJ2:.o]]", "[[OBJ3:.o]]"]			// CHECK: # "amdgcn-amd-amdhsa" - "offload bundler", inputs: ["[[IN:.o]]"], outputs: ["[[OBJ1:.o]]", "[[OBJ2:.o]]", "[[OBJ3:.o]]"]
	// CHECK: # "amdgcn-amd-amdhsa" - "AMDGCN::Linker", inputs: ["[[OBJ2]]"], output: "[[IMG2:.*out]]"			// CHECK: # "amdgcn-amd-amdhsa" - "AMDGCN::Linker", inputs: ["[[OBJ2]]"], output: "[[IMG2:.*out]]"
	// CHECK-NOT: offload bundler			// CHECK-NOT: offload bundler
	// CHECK: # "amdgcn-amd-amdhsa" - "AMDGCN::Linker", inputs: ["[[OBJ3]]"], output: "[[IMG3:.*out]]"			// CHECK: # "amdgcn-amd-amdhsa" - "AMDGCN::Linker", inputs: ["[[OBJ3]]"], output: "[[IMG3:.*out]]"
	// CHECK-NOT: offload bundler			// CHECK-NOT: offload bundler
	// CHECK: # "x86_64-unknown-linux-gnu" - "GNU::Linker", inputs: ["[[OBJ1]]", "{{.*}}/Inputs/in.so", "[[IMG2]]", "[[IMG3]]"], output: "a.out"			// CHECK: # "x86_64-unknown-linux-gnu" - "GNU::Linker", inputs: ["[[OBJ1]]", "{{.*}}/Inputs/in.so", "[[IMG2]]", "[[IMG3]]"], output: "a.out"