[Comgr] Add test for OpenCL 2.0

Author: lamb-j

amd/comgr/test-lit/CMakeLists.txt

@@ -40,7 +40,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 
 add_comgr_lit_binary(source-to-bc-with-dev-libs c)
 add_comgr_lit_binary(spirv-translator c)
-add_comgr_lit_binary(compile-minimal-test c)
+add_comgr_lit_binary(compile-opencl-minimal c)
 add_comgr_lit_binary(spirv-to-reloc c)
 add_comgr_lit_binary(unbundle c)
 add_comgr_lit_binary(data-action c)

amd/comgr/test-lit/cache-tests/compile-minimal-test-cached-bad-dir.cl

@@ -6,7 +6,7 @@
 // RUN: AMD_COMGR_CACHE_DIR=%t.txt \
 // RUN:   AMD_COMGR_EMIT_VERBOSE_LOGS=1 \
 // RUN:   AMD_COMGR_REDIRECT_LOGS=%t.log \
-// RUN:     compile-minimal-test %S/../compile-minimal-test.cl %t.bin
+// RUN:     compile-opencl-minimal %S/../compile-minimal-test.cl %t.bin 1.2
 // RUN: llvm-objdump -d %t.bin | FileCheck %S/../compile-minimal-test.cl
 // RUN: FileCheck --check-prefix=BAD %s < %t.log
 // BAD: Failed to open cache file

amd/comgr/test-lit/cache-tests/compile-minimal-test-cached-bad-policy.cl

@@ -6,7 +6,7 @@
 // RUN:   AMD_COMGR_CACHE_POLICY="foo=2h" \
 // RUN:   AMD_COMGR_EMIT_VERBOSE_LOGS=1 \
 // RUN:   AMD_COMGR_REDIRECT_LOGS=%t.log \
-// RUN:     compile-minimal-test %S/../compile-minimal-test.cl %t.bin
+// RUN:     compile-opencl-minimal %S/../compile-minimal-test.cl %t.bin 1.2
 // RUN: llvm-objdump -d %t.bin | FileCheck %S/../compile-minimal-test.cl
 // RUN: FileCheck --check-prefix=BAD %s < %t.log
 // BAD: when parsing the cache policy: Unknown key: 'foo'

amd/comgr/test-lit/cache-tests/compile-minimal-test-cached.cl

@@ -1,16 +1,16 @@
 // RUN: rm -fr %t.cache
 //
 // RUN: unset AMD_COMGR_CACHE
-// RUN: AMD_COMGR_CACHE_DIR=%t.cache compile-minimal-test \
-// RUN:    %S/../compile-minimal-test.cl %t.bin
+// RUN: AMD_COMGR_CACHE_DIR=%t.cache compile-opencl-minimal \
+// RUN:    %S/../compile-minimal-test.cl %t.bin 1.2
 // RUN: llvm-objdump -d %t.bin | FileCheck %S/../compile-minimal-test.cl
 // RUN: [ -d %t.cache ]
 //
 // RUN: rm -fr %t.cache
 //
 // RUN: export AMD_COMGR_CACHE=0
-// RUN: AMD_COMGR_CACHE_DIR=%t.cache compile-minimal-test \
-// RUN:    %S/../compile-minimal-test.cl %t.bin
+// RUN: AMD_COMGR_CACHE_DIR=%t.cache compile-opencl-minimal \
+// RUN:    %S/../compile-minimal-test.cl %t.bin 1.2
 // RUN: llvm-objdump -d %t.bin | FileCheck %S/../compile-minimal-test.cl
 // RUN: [ ! -d %t.cache ]
 //
@@ -19,17 +19,17 @@
 // COM: Run once and check that the cache directory exists and it has more than
 // COM     1 element (one for the cache tag, one or more for the cached
 // COM:    commands)
-// RUN: AMD_COMGR_CACHE_DIR=%t.cache compile-minimal-test \
-// RUN:    %S/../compile-minimal-test.cl %t_a.bin
+// RUN: AMD_COMGR_CACHE_DIR=%t.cache compile-opencl-minimal \
+// RUN:    %S/../compile-minimal-test.cl %t_a.bin 1.2
 // RUN: llvm-objdump -d %t_a.bin | FileCheck %S/../compile-minimal-test.cl
 // RUN: COUNT_BEFORE=$(ls "%t.cache" | wc -l)
 
 // COM: One element for the tag, one for bc->obj another for obj->exec. No
 // COM:    elements for src->bc since we currently not support it.
 // RUN: [ 3 -eq $COUNT_BEFORE ]
 //
-// RUN: AMD_COMGR_CACHE_DIR=%t.cache compile-minimal-test \
-// RUN:    %S/../compile-minimal-test.cl %t_b.bin
+// RUN: AMD_COMGR_CACHE_DIR=%t.cache compile-opencl-minimal \
+// RUN:    %S/../compile-minimal-test.cl %t_b.bin 1.2
 // RUN: llvm-objdump -d %t_b.bin | FileCheck %S/../compile-minimal-test.cl
 // RUN: COUNT_AFTER=$(ls "%t.cache" | wc -l)
 // RUN: [ $COUNT_AFTER = $COUNT_BEFORE ]

amd/comgr/test-lit/comgr-sources/compile-minimal-test.c renamed to amd/comgr/test-lit/comgr-sources/compile-opencl-minimal.c

@@ -1,4 +1,4 @@
-//===- compile-minimal-test.c ---------------------------------------------===//
+//===- compile-opencl-minimal.c -------------------------------------------===//
 //
 // Part of Comgr, under the Apache License v2.0 with LLVM Exceptions. See
 // amd/comgr/LICENSE.TXT in this repository for license information.
@@ -26,6 +26,16 @@ int main(int argc, char *argv[]) {
 
   SizeSource = setBuf(argv[1], &BufSource);
 
+  amd_comgr_language_t OpenCLVersion;
+  if (strcmp(argv[3], "1.2")) {
+    OpenCLVersion = AMD_COMGR_LANGUAGE_OPENCL_1_2;
+  }
+  else if (strcmp(argv[3], "2.0")) {
+    OpenCLVersion = AMD_COMGR_LANGUAGE_OPENCL_1_2;
+  }
+  else
+    fail("unsupported OCL version: %s", argv[3]);
+
   amd_comgr_(create_data_set(&DataSetIn));
   amd_comgr_(create_data(AMD_COMGR_DATA_KIND_SOURCE, &DataSource));
   amd_comgr_(set_data(DataSource, SizeSource, BufSource));

amd/comgr/test-lit/compile-minimal-test.cl

@@ -1,6 +1,6 @@
 // COM: Run Comgr binary to compile OpenCL source into LLVM IR Bitcode,
 // COM: and, then generate an executable
-// RUN: compile-minimal-test %s %t.bin
+// RUN: compile-opencl-minimal %s %t.bin 1.2
 
 // COM: Dissasemble
 // RUN: llvm-objdump -d %t.bin | FileCheck %s

amd/comgr/test-lit/compile-opencl-2.cl

@@ -0,0 +1,12 @@
+// COM: Run Comgr binary to compile OpenCL source into LLVM IR Bitcode,
+// COM: and, then generate an executable
+// RUN: compile-opencl-minimal %s %t.bin 2.0
+
+// COM: Dissasemble
+// RUN: llvm-objdump -d %t.bin | FileCheck %s
+// CHECK: <add>:
+// CHECK: s_endpgm
+
+void kernel add(__global float *A, __global float *B, __global float *C) {
+    *C = *A + *B;
+}

amd/comgr/test-lit/time-statistics.cl

@@ -1,5 +1,5 @@
 // COM: Check for any runtime errors with the Comgr Profilier
-// RUN: AMD_COMGR_TIME_STATISTICS=1 compile-minimal-test %s %t.bin
+// RUN: AMD_COMGR_TIME_STATISTICS=1 compile-opencl-minimal %s %t.bin 1.2
 // RUN: test -f PerfStatsLog.txt
 
 void kernel add(__global float *A, __global float *B, __global float *C) {