Generalize sycl-clang-py to allow passing arbitrary cgeist args.

Signed-off-by: Tiotto, Ettore <ettore.tiotto@intel.com>

Author: etiotto

polygeist/tools/cgeist/Test/Verification/sycl/constructors.cpp

@@ -8,7 +8,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-// RUN: sycl-clang.py %s 2> /dev/null | FileCheck %s
+// RUN: sycl-clang.py %s -S -function=* 2> /dev/null | FileCheck %s
 
 #include <sycl/sycl.hpp>
 

polygeist/tools/cgeist/Test/Verification/sycl/functions.cpp

@@ -8,7 +8,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-// RUN: sycl-clang.py %s | FileCheck %s
+// RUN: sycl-clang.py %s -S -function=* | FileCheck %s
 
 #include <sycl/sycl.hpp>
 
@@ -48,9 +48,7 @@ SYCL_EXTERNAL void method_2(sycl::item<2, true> item) {
 // CHECK-NEXT: %3 = memref.cast %2 : memref<1x!sycl_id_2_> to memref<?x!sycl_id_2_>
 // CHECK-NEXT: affine.store %arg0, %2[0] : memref<1x!sycl_id_2_>
 // CHECK-NEXT: affine.store %arg1, %0[0] : memref<1x!sycl_id_2_>
-// CHECK-NEXT: %4 = sycl.cast(%3) : (memref<?x!sycl_id_2_>) -> memref<?x!sycl_array_2_>
-// CHECK-NEXT: %5 = sycl.cast(%1) : (memref<?x!sycl_id_2_>) -> memref<?x!sycl_array_2_>
-// CHECK-NEXT: %6 = sycl.call(%4, %5) {Function = @"operator==", Type = @array} : (memref<?x!sycl_array_2_>, memref<?x!sycl_array_2_>) -> i8
+// CHECK-NEXT: %4 = sycl.call(%3, %1) {Function = @"operator==", Type = @id} : (memref<?x!sycl_id_2_>, memref<?x!sycl_id_2_>) -> i8
 // CHECK-NEXT: return
 // CHECK-NEXT: }
 

polygeist/tools/cgeist/Test/Verification/sycl/kernels.cpp

@@ -8,7 +8,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-// RUN: sycl-clang.py %s | FileCheck %s
+// RUN: sycl-clang.py %s -S -function=* | FileCheck %s
 
 #include <sycl/sycl.hpp>
 

polygeist/tools/cgeist/Test/Verification/sycl/types.cpp

@@ -8,7 +8,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-// RUN: sycl-clang.py %s | FileCheck %s
+// RUN: sycl-clang.py %s -S -function=* | FileCheck %s
 
 #include <sycl/sycl.hpp>
 

polygeist/tools/cgeist/sycl-clang.py.in

@@ -22,14 +22,21 @@ def main():
     mlir_tool = bin_path + "/cgeist"
     clang_tool = bin_path + "/clang++"
     arg_file = sys.argv[1]
+
+    # Invoke clang, capture the command line produced by clang.
     clang_args = [clang_tool, "-###", "-fsycl", "-fsycl-device-only", "-D__SYCL_DISABLE_PARALLEL_FOR_RANGE_ROUNDING__"]
-    clang_args.extend(sys.argv[1:])
+    n = len(clang_args)
+    clang_args.extend(sys.argv[1:2])
     clang_res = subprocess.Popen(clang_args, stderr=subprocess.PIPE)
     output = clang_res.stderr.readlines()
-    expanded_clang_args = output[5].decode("utf-8")
+    expanded_clang_args = output[n].decode("utf-8")
     split_output = shlex.split(expanded_clang_args)
 
-    mlir_args = [mlir_tool, "-S", "--function=main", arg_file, "--args"]
+    # Form the cgeist invocation command. Append the MLIR flags first, then append the clang flags after "--args".
+    mlir_args = [mlir_tool]
+    mlir_args.extend(sys.argv[2:])
+    mlir_args.append(arg_file)
+    mlir_args.append("--args")
     mlir_args.extend(split_output[1:])
     mlir_res = subprocess.Popen(mlir_args)
     mlir_res.wait()