Merge from 'master' to 'xmain-web' (KhronosGroup#28)

vmaksimo · Oct 28, 2020 · ea1dc4f · ea1dc4f
2 parents 135755e + 35c423e
commit ea1dc4f
Show file tree

Hide file tree

Showing 32 changed files with 59 additions and 85 deletions.
diff --git a/test/check_empty_file.ll b/test/check_empty_file.ll
diff --git a/test/abs.ll → test/llvm-intrinsics/abs.ll b/test/abs.ll → test/llvm-intrinsics/abs.ll
diff --git a/test/transcoding/llvm.assume.ll → test/llvm-intrinsics/assume.ll b/test/transcoding/llvm.assume.ll → test/llvm-intrinsics/assume.ll
diff --git a/test/llvm.ceil.ll → test/llvm-intrinsics/ceil.ll b/test/llvm.ceil.ll → test/llvm-intrinsics/ceil.ll
diff --git a/test/constrained_arifm_intr.ll → ...llvm-intrinsics/constrained-arithmetic.ll b/test/constrained_arifm_intr.ll → ...llvm-intrinsics/constrained-arithmetic.ll
diff --git a/test/constrained_cmp_intr.ll → ...llvm-intrinsics/constrained-comparison.ll b/test/constrained_cmp_intr.ll → ...llvm-intrinsics/constrained-comparison.ll
diff --git a/test/constrained_convert_intr.ll → test/llvm-intrinsics/constrained-convert.ll b/test/constrained_convert_intr.ll → test/llvm-intrinsics/constrained-convert.ll
diff --git a/test/llvm-intrinsics/ctlz.ll b/test/llvm-intrinsics/ctlz.ll
@@ -0,0 +1,34 @@
+; RUN: llvm-as %s -o %t.bc
+; RUN: llvm-spirv %t.bc -spirv-text -o - | FileCheck %s
+; RUN: llvm-spirv %t.bc -o %t.spv
+; RUN: spirv-val %t.spv
+
+target datalayout = "e-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024"
+target triple = "spir64-unknown-unknown"
+
+; CHECK: ExtInstImport [[extinst_id:[0-9]+]] "OpenCL.std"
+
+; CHECK: Function
+; CHECK: 6 ExtInst {{[0-9]+}} {{[0-9]+}} [[extinst_id]] clz
+; CHECK: FunctionEnd
+
+; Function Attrs: nounwind readnone
+define spir_func i32 @TestClz(i32 %x) local_unnamed_addr #0 {
+entry:
+  %0 = tail call i32 @llvm.ctlz.i32(i32 %x, i1 true)
+  ret i32 %0
+}
+
+; Function Attrs: nounwind readnone speculatable willreturn
+declare i32 @llvm.ctlz.i32(i32, i1 immarg) #1
+
+attributes #0 = { nounwind readnone "correctly-rounded-divide-sqrt-fp-math"="false" "denorms-are-zero"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { nounwind readnone speculatable willreturn }
+
+!llvm.module.flags = !{!0}
+!opencl.ocl.version = !{!1}
+!opencl.spir.version = !{!2}
+
+!0 = !{i32 1, !"wchar_size", i32 4}
+!1 = !{i32 1, i32 0}
+!2 = !{i32 1, i32 2}
diff --git a/test/ctpop.ll → test/llvm-intrinsics/ctpop.ll b/test/ctpop.ll → test/llvm-intrinsics/ctpop.ll
diff --git a/test/count-zero-bits.ll → test/llvm-intrinsics/cttz.ll b/test/count-zero-bits.ll → test/llvm-intrinsics/cttz.ll
@@ -8,17 +8,6 @@ target triple = "spir64-unknown-unknown"
 
 ; CHECK: ExtInstImport [[extinst_id:[0-9]+]] "OpenCL.std"
 
-; CHECK: Function
-; CHECK: 6 ExtInst {{[0-9]+}} {{[0-9]+}} [[extinst_id]] clz
-; CHECK: FunctionEnd
-
-; Function Attrs: nounwind readnone
-define spir_func i32 @TestClz(i32 %x) local_unnamed_addr #0 {
-entry:
-  %0 = tail call i32 @llvm.ctlz.i32(i32 %x, i1 true)
-  ret i32 %0
-}
-
 ; CHECK: Function
 ; CHECK: 6 ExtInst {{[0-9]+}} {{[0-9]+}} [[extinst_id]] ctz
 ; CHECK: FunctionEnd
@@ -41,9 +30,6 @@ entry:
   ret <4 x i32> %0
 }
 
-; Function Attrs: nounwind readnone speculatable willreturn
-declare i32 @llvm.ctlz.i32(i32, i1 immarg) #1
-
 ; Function Attrs: nounwind readnone speculatable willreturn
 declare i32 @llvm.cttz.i32(i32, i1 immarg) #1
 

diff --git a/test/transcoding/llvm.expect.ll → test/llvm-intrinsics/expect.ll b/test/transcoding/llvm.expect.ll → test/llvm-intrinsics/expect.ll
diff --git a/test/llvm.fabs.ll → test/llvm-intrinsics/fabs.ll b/test/llvm.fabs.ll → test/llvm-intrinsics/fabs.ll
diff --git a/test/llvm.fmuladd.ll → test/llvm-intrinsics/fmuladd.ll b/test/llvm.fmuladd.ll → test/llvm-intrinsics/fmuladd.ll
diff --git a/test/llvm.invariant.ll → test/llvm-intrinsics/invariant.ll b/test/llvm.invariant.ll → test/llvm-intrinsics/invariant.ll
diff --git a/test/transcoding/lifetime.ll → test/llvm-intrinsics/lifetime.ll b/test/transcoding/lifetime.ll → test/llvm-intrinsics/lifetime.ll
@@ -19,6 +19,8 @@
 target datalayout = "e-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024"
 target triple = "spir64-unknown-unknown"
 
+%class.anon = type { i8 }
+
 ; Function Attrs: nounwind
 define spir_kernel void @lifetime_simple(i32 addrspace(1)* nocapture %res, i32 addrspace(1)* nocapture %lhs, i32 addrspace(1)* nocapture %rhs) #0 !kernel_arg_addr_space !1 !kernel_arg_access_qual !2 !kernel_arg_type !3 !kernel_arg_base_type !5 !kernel_arg_type_qual !4 {
   %1 = alloca i32
@@ -40,6 +42,26 @@ define spir_kernel void @lifetime_simple(i32 addrspace(1)* nocapture %res, i32 a
   ret void
 }
 
+define spir_kernel void @lifetime_sized() #0 !kernel_arg_addr_space !8 !kernel_arg_access_qual !8 !kernel_arg_type !8 !kernel_arg_base_type !8 !kernel_arg_type_qual !8 {
+entry:
+  %0 = alloca %class.anon, align 1
+  %1 = bitcast %class.anon* %0 to i8*
+  call void @llvm.lifetime.start.p0i8(i64 1, i8* %1) #0
+  call spir_func void @foo(%class.anon* %0)
+  %2 = bitcast %class.anon* %0 to i8*
+  call void @llvm.lifetime.end.p0i8(i64 1, i8* %2) #0
+  ret void
+}
+
+; Function Attrs: inlinehint nounwind
+define internal spir_func void @foo(%class.anon* %this) #0 align 2 {
+entry:
+  %this.addr = alloca %class.anon*, align 8
+  store %class.anon* %this, %class.anon** %this.addr, align 8
+  %this1 = load %class.anon*, %class.anon** %this.addr, align 8
+  ret void
+}
+
 ; Function Attrs: nounwind
 declare void @llvm.lifetime.start.p0i8(i64 immarg, i8* nocapture) #0
 

diff --git a/test/maxnum.ll → test/llvm-intrinsics/maxnum.ll b/test/maxnum.ll → test/llvm-intrinsics/maxnum.ll
diff --git a/test/transcoding/llvm.memcpy.align.ll → test/llvm-intrinsics/memcpy.align.ll b/test/transcoding/llvm.memcpy.align.ll → test/llvm-intrinsics/memcpy.align.ll
diff --git a/test/transcoding/llvm.memmove.ll → test/llvm-intrinsics/memmove.ll b/test/transcoding/llvm.memmove.ll → test/llvm-intrinsics/memmove.ll
diff --git a/test/transcoding/llvm.memset.ll → test/llvm-intrinsics/memset.ll b/test/transcoding/llvm.memset.ll → test/llvm-intrinsics/memset.ll
diff --git a/test/nearbyint.ll → test/llvm-intrinsics/nearbyint.ll b/test/nearbyint.ll → test/llvm-intrinsics/nearbyint.ll
diff --git a/test/llvm.sadd.with.overflow.ll → test/llvm-intrinsics/sadd.with.overflow.ll b/test/llvm.sadd.with.overflow.ll → test/llvm-intrinsics/sadd.with.overflow.ll
diff --git a/test/llvm.sqrt.ll → test/llvm-intrinsics/sqrt.ll b/test/llvm.sqrt.ll → test/llvm-intrinsics/sqrt.ll
diff --git a/test/trap.ll → test/llvm-intrinsics/trap.ll b/test/trap.ll → test/llvm-intrinsics/trap.ll
diff --git a/test/usub-sat.ll → test/llvm-intrinsics/usub.sat.ll b/test/usub-sat.ll → test/llvm-intrinsics/usub.sat.ll
diff --git a/test/InvalidAtomicBuiltins.cl → test/negative/InvalidAtomicBuiltins.cl b/test/InvalidAtomicBuiltins.cl → test/negative/InvalidAtomicBuiltins.cl
diff --git a/test/negative/check-empty-file.ll b/test/negative/check-empty-file.ll
@@ -0,0 +1,3 @@
+; RUN: not llvm-spirv %S/empty-file.bc -o - 2>&1 | FileCheck %s
+
+; CHECK: Can't translate, file is empty
diff --git a/test/empty_file.bc → test/negative/empty-file.bc b/test/empty_file.bc → test/negative/empty-file.bc
diff --git a/test/regularize-invalid-llvm.ll → test/negative/regularize-invalid-llvm.ll b/test/regularize-invalid-llvm.ll → test/negative/regularize-invalid-llvm.ll
diff --git a/test/spirv-unknown-extensions.spt → test/negative/spirv-unknown-extensions.spt b/test/spirv-unknown-extensions.spt → test/negative/spirv-unknown-extensions.spt
diff --git a/test/spirv-version-controls-negative-1.spt → test/negative/spirv-version-controls-1.spt b/test/spirv-version-controls-negative-1.spt → test/negative/spirv-version-controls-1.spt
diff --git a/test/spirv-version-controls-negative-2.spt → test/negative/spirv-version-controls-2.spt b/test/spirv-version-controls-negative-2.spt → test/negative/spirv-version-controls-2.spt
diff --git a/test/transcoding/lifetime-sized.ll b/test/transcoding/lifetime-sized.ll