Merge branch 'aurora_offloading_prototype' into sotoc-vla-arguments

Conflicts:
	tools/sotoc/test/arrays/global_array_static.c
	tools/sotoc/test/arrays/static_variable_length_array_2d.c
	tools/sotoc/test/arrays/variable_length_array_2d.c

Author: manorom

clang/tools/sotoc/test/arrays/static_variable_length_array_2d.c

@@ -17,7 +17,11 @@ int main(){
   }
 
   for (j = 0; j < size; j+=64) {
+<<<<<<< HEAD
     printf("%.2f %.2f ",A[j][0],A[j][1]);
+=======
+    printf("%.2f %.2f",A[j][0],A[j][1]);
+>>>>>>> aurora_offloading_prototype
   }
   return 0;
 }

clang/tools/sotoc/test/arrays/variable_length_array_2d.c

@@ -7,6 +7,7 @@ int main(){
   int sizeX=512;
   int sizeY=512;
   float A[sizeX][sizeY]; 
+  
   #pragma omp target map(tofrom:A[:sizeX][:sizeY])
   {
     int i;

clang/tools/sotoc/test/declare_target/function_pointer.c

@@ -0,0 +1,25 @@
+// RUN: %sotoc-transform-compile
+// RUN: %run-on-host | %filecheck %s
+#include <stdio.h>
+
+#pragma omp declare target
+void execfunc(void(*func)(void)){
+  func();
+}
+
+void foo(){
+  printf("42");
+  fflush(0);
+}
+#pragma omp end declare target
+
+int main(void) {
+
+#pragma omp target device(0)
+  {
+    execfunc(&foo);
+  }
+  return 0;
+}
+
+// CHECK: 42 

clang/tools/sotoc/test/declare_target/function_pointer_no_declare.c

@@ -0,0 +1,25 @@
+// RUN: %sotoc-transform-compile
+// RUN: %run-on-host | %filecheck %s
+#include <stdio.h>
+
+void execfunc(void(*func)(void)){
+  func();
+}
+
+#pragma omp declare target
+void foo(){
+  printf("42");
+  fflush(0);
+}
+#pragma omp end declare target
+
+int main(void) {
+
+#pragma omp target device(0)
+  {
+    execfunc(&foo);
+  }
+  return 0;
+}
+
+// CHECK: 42