This is an archive of the discontinued LLVM Phabricator instance.

Differential D103658

CUDA/HIP: Change device-use-host-var.cu's NOT "external" check to include "addrspace"
ClosedPublic

Authored by kzhuravl on Jun 3 2021, 4:31 PM.

Details

Reviewers
yaxunl
tra
Commits
rG4d9f8527dbfb: CUDA/HIP: Change device-use-host-var.cu's NOT "external" check to include…
Summary

Otherwise it is causing one of our build jobs to fail, it is using "external" as directory, and NOT is failing because "external" is found in ModuleID.

Diff Detail

Event Timeline

kzhuravl requested review of this revision.Jun 3 2021, 4:31 PM
kzhuravl created this revision.
Herald added a subscriber: wdng. · View Herald TranscriptJun 3 2021, 4:31 PM
tra added a subscriber: tra.Jun 3 2021, 5:03 PM
tra added inline comments.
clang/test/CodeGenCUDA/device-use-host-var.cu
68

This may be too specific. What if we end up generating a variable in generic AS which does not have addrspace.
Considering that we went to make sure we don't create references to external variables, we want something like this instead:

NEG-NOT: {{^}}@{{.*}} = external
Harbormaster completed remote builds in B107580: Diff 349727.Jun 3 2021, 5:09 PM
kzhuravl updated this revision to Diff 349732.Jun 3 2021, 5:24 PM
kzhuravl marked an inline comment as done.

Address review feedback.

tra accepted this revision.Jun 3 2021, 5:28 PM
This revision is now accepted and ready to land.Jun 3 2021, 5:28 PM
yaxunl accepted this revision.Jun 3 2021, 5:45 PM

LGTM. thanks

Harbormaster completed remote builds in B107583: Diff 349732.Jun 3 2021, 6:03 PM
Closed by commit rG4d9f8527dbfb: CUDA/HIP: Change device-use-host-var.cu's NOT "external" check to include… (authored by kzhuravl). · Explain WhyJun 4 2021, 10:10 AM
This revision was automatically updated to reflect the committed changes.
kzhuravl added a commit: rG4d9f8527dbfb: CUDA/HIP: Change device-use-host-var.cu's NOT "external" check to include….
Herald added a project: Restricted Project. · View Herald TranscriptJun 4 2021, 10:10 AM
yaxunl mentioned this in D103108: [CUDA][HIP] Promote const variables to constant.Jun 4 2021, 3:55 PM

Revision Contents

PathSize
clang/
test/
CodeGenCUDA/
2 lines

Diff 349908

clang/test/CodeGenCUDA/device-use-host-var.cu

Show First 20 Lines • Show All 59 Lines • ▼ Show 20 Lines
// CHECK-DAG: @_ZL9const_var = internal addrspace(4) constant i32 4 // CHECK-DAG: @_ZL9const_var = internal addrspace(4) constant i32 4
// CHECK-DAG: @_ZL12const_struct = internal addrspace(4) constant %struct.A { i32 5 } // CHECK-DAG: @_ZL12const_struct = internal addrspace(4) constant %struct.A { i32 5 }
// CHECK-DAG: @_ZL11const_array = internal addrspace(4) constant [4 x %struct.A] [%struct.A zeroinitializer, %struct.A zeroinitializer, %struct.A zeroinitializer, %struct.A { i32 6 }] // CHECK-DAG: @_ZL11const_array = internal addrspace(4) constant [4 x %struct.A] [%struct.A zeroinitializer, %struct.A zeroinitializer, %struct.A zeroinitializer, %struct.A { i32 6 }]
// CHECK-DAG: @_ZL9const_str = internal addrspace(4) constant [4 x i8] c"xyz\00" // CHECK-DAG: @_ZL9const_str = internal addrspace(4) constant [4 x i8] c"xyz\00"
// NEG-NOT: @_ZN1BIiE1yE // NEG-NOT: @_ZN1BIiE1yE
// NEG-NOT: @_Z1bIdE // NEG-NOT: @_Z1bIdE
// NEG-NOT: @_ZL13var_host_only // NEG-NOT: @_ZL13var_host_only
// NEG-NOT: external // NEG-NOT: {{^}}@{{.*}} = external
traUnsubmitted
Done
ReplyInline Actions

This may be too specific. What if we end up generating a variable in generic AS which does not have addrspace.
Considering that we went to make sure we don't create references to external variables, we want something like this instead:

NEG-NOT: {{^}}@{{.*}} = external
tra: This may be too specific. What if we end up generating a variable in generic AS which does not…
// CHECK-LABEL: define{{.*}}@_Z7dev_funPiPPKi // CHECK-LABEL: define{{.*}}@_Z7dev_funPiPPKi
// CHECK: store i32 1 // CHECK: store i32 1
// CHECK: store i32 2 // CHECK: store i32 2
// CHECK: store i32 3 // CHECK: store i32 3
// CHECK: load i8, i8* getelementptr {{.*}} @_ZL13constexpr_str.const // CHECK: load i8, i8* getelementptr {{.*}} @_ZL13constexpr_str.const
// CHECK: store i32 4 // CHECK: store i32 4
// CHECK: store i32 5 // CHECK: store i32 5
Show All 30 Lines