Skip to content

Commit df1b2be

Browse files
committed
[CUDA] Explicitly construct dim3() return values.
Fixes CUDA build break caused by 5c082e7
1 parent bdc3ce9 commit df1b2be

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

Diff for: clang/lib/Headers/__clang_cuda_intrinsics.h

+12-12
Original file line numberDiff line numberDiff line change
@@ -607,27 +607,27 @@ __device__ inline unsigned __clusterDimIsSpecified() {
607607
}
608608

609609
__device__ inline dim3 __clusterDim() {
610-
return {__nvvm_read_ptx_sreg_cluster_nctaid_x(),
611-
__nvvm_read_ptx_sreg_cluster_nctaid_y(),
612-
__nvvm_read_ptx_sreg_cluster_nctaid_z()};
610+
return dim3(__nvvm_read_ptx_sreg_cluster_nctaid_x(),
611+
__nvvm_read_ptx_sreg_cluster_nctaid_y(),
612+
__nvvm_read_ptx_sreg_cluster_nctaid_z());
613613
}
614614

615615
__device__ inline dim3 __clusterRelativeBlockIdx() {
616-
return {__nvvm_read_ptx_sreg_cluster_ctaid_x(),
617-
__nvvm_read_ptx_sreg_cluster_ctaid_y(),
618-
__nvvm_read_ptx_sreg_cluster_ctaid_z()};
616+
return dim3(__nvvm_read_ptx_sreg_cluster_ctaid_x(),
617+
__nvvm_read_ptx_sreg_cluster_ctaid_y(),
618+
__nvvm_read_ptx_sreg_cluster_ctaid_z());
619619
}
620620

621621
__device__ inline dim3 __clusterGridDimInClusters() {
622-
return {__nvvm_read_ptx_sreg_nclusterid_x(),
623-
__nvvm_read_ptx_sreg_nclusterid_y(),
624-
__nvvm_read_ptx_sreg_nclusterid_z()};
622+
return dim3(__nvvm_read_ptx_sreg_nclusterid_x(),
623+
__nvvm_read_ptx_sreg_nclusterid_y(),
624+
__nvvm_read_ptx_sreg_nclusterid_z());
625625
}
626626

627627
__device__ inline dim3 __clusterIdx() {
628-
return {__nvvm_read_ptx_sreg_clusterid_x(),
629-
__nvvm_read_ptx_sreg_clusterid_y(),
630-
__nvvm_read_ptx_sreg_clusterid_z()};
628+
return dim3(__nvvm_read_ptx_sreg_clusterid_x(),
629+
__nvvm_read_ptx_sreg_clusterid_y(),
630+
__nvvm_read_ptx_sreg_clusterid_z());
631631
}
632632

633633
__device__ inline unsigned __clusterRelativeBlockRank() {

0 commit comments

Comments
 (0)