[CIR][Test][NFC] Fix invalid testcases involving kernel calls in OpenCL kernels (#1830)

Fix #1814.

Author: seven-mile

clang/test/CIR/CodeGen/OpenCL/spir-calling-conv.cl

@@ -1,24 +1,16 @@
 // RUN: %clang_cc1 -fclangir %s -O0 -triple "spirv64-unknown-unknown" -emit-cir -o %t.cir
 // RUN: FileCheck %s --input-file=%t.cir --check-prefix=CIR
-// RUN-DISABLE: %clang_cc1 -fclangir %s -O0 -triple "spirv64-unknown-unknown" -emit-llvm -fno-clangir-call-conv-lowering -o %t.ll
-// RUN-DISABLE: FileCheck %s --input-file=%t.ll --check-prefix=LLVM
+// RUN: %clang_cc1 -fclangir %s -O0 -triple "spirv64-unknown-unknown" -emit-llvm -fno-clangir-call-conv-lowering -o %t.ll
+// RUN: FileCheck %s --input-file=%t.ll --check-prefix=LLVM
 
 // CIR: cir.func {{.*}}@get_dummy_id{{.*}} cc(spir_function)
 // LLVM-DAG: declare{{.*}} spir_func i32 @get_dummy_id(
 int get_dummy_id(int D);
 
-// CIR: cir.func {{.*}}@bar{{.*}} cc(spir_kernel)
-// LLVM-DAG: declare{{.*}} spir_kernel void @bar(
-kernel void bar(global int *A);
-
 // CIR: cir.func {{.*}}@foo{{.*}} cc(spir_kernel)
 // LLVM-DAG: define{{.*}} spir_kernel void @foo(
 kernel void foo(global int *A) {
   int id = get_dummy_id(0);
   // CIR: %{{[0-9]+}} = cir.call @get_dummy_id(%2) : (!s32i) -> !s32i cc(spir_function)
   // LLVM: %{{[a-z0-9_]+}} = call spir_func i32 @get_dummy_id(
-  A[id] = id;
-  bar(A);
-  // CIR: cir.call @bar(%8) : (!cir.ptr<!s32i, addrspace(offload_global)>) -> () cc(spir_kernel)
-  // LLVM: call spir_kernel void @bar(ptr addrspace(1)
 }

clang/test/CIR/Lowering/call-op-call-conv.cir

@@ -8,14 +8,10 @@ module {
   cir.func private @my_add(%a: !s32i, %b: !s32i) -> !s32i cc(spir_function)
 
   cir.func @ind(%fnptr: !fnptr, %a : !s32i) {
-    // https://github.com/llvm/clangir/issues/1814
-    // %1 = cir.call %fnptr(%a) : (!fnptr, !s32i) -> !s32i cc(spir_kernel)
-    // LLVM-DISABLE: %{{[0-9]+}} = call spir_kernel i32 %{{[0-9]+}}(i32 %{{[0-9]+}})
-
-    %2 = cir.call %fnptr(%a) : (!fnptr, !s32i) -> !s32i cc(spir_function)
+    %1 = cir.call %fnptr(%a) : (!fnptr, !s32i) -> !s32i cc(spir_function)
     // LLVM: %{{[0-9]+}} = call spir_func i32 %{{[0-9]+}}(i32 %{{[0-9]+}})
 
-    %3 = cir.call @my_add(%2, %2) : (!s32i, !s32i) -> !s32i cc(spir_function)
+    %2 = cir.call @my_add(%1, %1) : (!s32i, !s32i) -> !s32i cc(spir_function)
     // LLVM: %{{[0-9]+}} = call spir_func i32 @my_add(i32 %{{[0-9]+}}, i32 %{{[0-9]+}})
 
     cir.return