From 30caae6d23d92a72126cdb2223bd5d2155fd8544 Mon Sep 17 00:00:00 2001 From: Tobias Grosser Date: Fri, 28 Jul 2017 06:38:49 +0000 Subject: [PATCH] [GPGPU] Fix compilation issue with latest CUDA upgrade to i128 llvm-svn: 309366 --- polly/lib/CodeGen/PPCGCodeGeneration.cpp | 8 ++++---- polly/test/GPGPU/kernel-params-only-some-arrays.ll | 4 ++-- polly/test/GPGPU/spir-codegen.ll | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/polly/lib/CodeGen/PPCGCodeGeneration.cpp b/polly/lib/CodeGen/PPCGCodeGeneration.cpp index 75c060a..dfbae93 100644 --- a/polly/lib/CodeGen/PPCGCodeGeneration.cpp +++ b/polly/lib/CodeGen/PPCGCodeGeneration.cpp @@ -1739,11 +1739,11 @@ static std::string computeNVPTXDataLayout(bool is64Bit) { if (!is64Bit) { Ret += "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:" - "64-f32:32:32-f64:64:64-v16:16:16-v32:32:32-v64:64:" + "64-i128:128:128-f32:32:32-f64:64:64-v16:16:16-v32:32:32-v64:64:" "64-v128:128:128-n16:32:64"; } else { Ret += "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:" - "64-f32:32:32-f64:64:64-v16:16:16-v32:32:32-v64:64:" + "64-i128:128:128-f32:32:32-f64:64:64-v16:16:16-v32:32:32-v64:64:" "64-v128:128:128-n16:32:64"; } @@ -1758,12 +1758,12 @@ static std::string computeSPIRDataLayout(bool is64Bit) { if (!is64Bit) { Ret += "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:" - "64-f32:32:32-f64:64:64-v16:16:16-v24:32:32-v32:32:" + "64-i128:128:128-f32:32:32-f64:64:64-v16:16:16-v24:32:32-v32:32:" "32-v48:64:64-v64:64:64-v96:128:128-v128:128:128-v192:" "256:256-v256:256:256-v512:512:512-v1024:1024:1024"; } else { Ret += "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:" - "64-f32:32:32-f64:64:64-v16:16:16-v24:32:32-v32:32:" + "64-i128:128:128-f32:32:32-f64:64:64-v16:16:16-v24:32:32-v32:32:" "32-v48:64:64-v64:64:64-v96:128:128-v128:128:128-v192:" "256:256-v256:256:256-v512:512:512-v1024:1024:1024"; } diff --git a/polly/test/GPGPU/kernel-params-only-some-arrays.ll b/polly/test/GPGPU/kernel-params-only-some-arrays.ll index d689ac9..068202e 100644 --- a/polly/test/GPGPU/kernel-params-only-some-arrays.ll +++ b/polly/test/GPGPU/kernel-params-only-some-arrays.ll @@ -18,7 +18,7 @@ ; KERNEL: ; ModuleID = 'FUNC_kernel_params_only_some_arrays_SCOP_0_KERNEL_0' ; KERNEL-NEXT: source_filename = "FUNC_kernel_params_only_some_arrays_SCOP_0_KERNEL_0" -; KERNEL-NEXT: target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v16:16:16-v32:32:32-v64:64:64-v128:128:128-n16:32:64" +; KERNEL-NEXT: target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-i128:128:128-f32:32:32-f64:64:64-v16:16:16-v32:32:32-v64:64:64-v128:128:128-n16:32:64" ; KERNEL-NEXT: target triple = "nvptx64-nvidia-cuda" ; KERNEL: define ptx_kernel void @FUNC_kernel_params_only_some_arrays_SCOP_0_KERNEL_0(i8 addrspace(1)* %MemRef_B) @@ -33,7 +33,7 @@ ; KERNEL: ; ModuleID = 'FUNC_kernel_params_only_some_arrays_SCOP_0_KERNEL_1' ; KERNEL-NEXT: source_filename = "FUNC_kernel_params_only_some_arrays_SCOP_0_KERNEL_1" -; KERNEL-NEXT: target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v16:16:16-v32:32:32-v64:64:64-v128:128:128-n16:32:64" +; KERNEL-NEXT: target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-i128:128:128-f32:32:32-f64:64:64-v16:16:16-v32:32:32-v64:64:64-v128:128:128-n16:32:64" ; KERNEL-NEXT: target triple = "nvptx64-nvidia-cuda" ; KERNEL: define ptx_kernel void @FUNC_kernel_params_only_some_arrays_SCOP_0_KERNEL_1(i8 addrspace(1)* %MemRef_A) diff --git a/polly/test/GPGPU/spir-codegen.ll b/polly/test/GPGPU/spir-codegen.ll index aae4adc..52abf31 100644 --- a/polly/test/GPGPU/spir-codegen.ll +++ b/polly/test/GPGPU/spir-codegen.ll @@ -5,7 +5,7 @@ ; REQUIRES: pollyacc -; CHECK: target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v16:16:16-v24:32:32-v32:32:32-v48:64:64-v64:64:64-v96:128:128-v128:128:128-v192:256:256-v256:256:256-v512:512:512-v1024:1024:1024" +; CHECK: target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-i128:128:128-f32:32:32-f64:64:64-v16:16:16-v24:32:32-v32:32:32-v48:64:64-v64:64:64-v96:128:128-v128:128:128-v192:256:256-v256:256:256-v512:512:512-v1024:1024:1024" ; CHECK-NEXT: target triple = "spir-unknown-unknown" ; CHECK-LABEL: define spir_kernel void @FUNC_double_parallel_loop_SCOP_0_KERNEL_0(i8 addrspace(1)* %MemRef0) #0 !kernel_arg_addr_space !0 !kernel_arg_name !1 !kernel_arg_access_qual !1 !kernel_arg_type !1 !kernel_arg_type_qual !1 !kernel_arg_base_type !1 { -- 2.7.4