[Comgr][SPIRV] Specify OpenCL 2.0 for SPIRV translation

The current default is OpenCL 1.2, but for now we only handle
OpenCL 2.0.

Also clarified that the Log output is the command line equivalent

Change-Id: I674547380d838f4021b28c746b5e8780e6c43cd6

Author: lamb-j

amd/comgr/src/comgr-compiler.cpp

@@ -1883,7 +1883,11 @@ amd_comgr_status_t AMDGPUCompiler::translateSpirvToBitcode() {
     llvm::Module *M;
     std::string Err;
 
-    if (!llvm::readSpirv(Context, ISS, M, Err)) {
+    SPIRV::TranslatorOpts Opts;
+    Opts.enableAllExtensions();
+    Opts.setDesiredBIsRepresentation(SPIRV::BIsRepresentation::OpenCL20);
+
+    if (!llvm::readSpirv(Context, Opts, ISS, M, Err)) {
       LogS << "Failed to load SPIR-V as LLVM Module: " << Err << '\n';
       return AMD_COMGR_STATUS_ERROR;
     }
@@ -1910,8 +1914,9 @@ amd_comgr_status_t AMDGPUCompiler::translateSpirvToBitcode() {
       return Status;
     }
 
-    LogS << "SPIR-V Translation: amd-llvm-spirv -r " << Input->Name << " " <<
-      Output->Name << "\n";
+    LogS << "  SPIR-V Translation: amd-llvm-spirv -r "
+      << "--spirv-target-env=CL2.0 " << Input->Name << " -o " << Output->Name
+      << " (command line equivalent)\n";
   }
 
   return AMD_COMGR_STATUS_SUCCESS;

amd/comgr/test-lit/spirv-translator.cl

@@ -5,7 +5,7 @@
 // RUN: clang -c -emit-llvm --target=spirv64 %s -o %t.bc
 
 // COM: Translate LLVM IR to SPIRV format
-// RUN: amd-llvm-spirv %t.bc -o %t.spv
+// RUN: amd-llvm-spirv --spirv-target-env=CL2.0 %t.bc -o %t.spv
 
 // COM: Run Comgr Translator to covert SPIRV back to LLVM IR
 // RUN: spirv-translator %t.spv -o %t.translated.bc