Merge branch 'aomp-epsdb' into aomp-epsdb-mainline

Change-Id: Ibfcd0e87c457d781e1fa8079959419974fcd9337
ROCm · Apr 10, 2022 · a85c614 · a85c614
2 parents 750941e + a2f92ea
commit a85c614
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/test/offloading/amdgpu/run_tests.sh b/test/offloading/amdgpu/run_tests.sh
@@ -18,7 +18,7 @@ FC=flang
 TARGET_FLAGS="-target x86_64-pc-linux-gnu"
 DEVICE_FLAGS="-fopenmp -fopenmp-targets=amdgcn-amd-amdhsa -Xopenmp-target=amdgcn-amd-amdhsa"
 MARCH="-march=gfx900"
-VERSION="-mllvm -amdhsa-code-object-version=3"
+VERSION="-mllvm -amdhsa-code-object-version=4"
 #XFLAGS="-Mx,232,0x40"
 XFLAGS=""
 FFLAGS="$TARGET_FLAGS $DEVICE_FLAGS $MARCH $XFLAGS $VERSION -fuse-ld=ld -nogpulib"

diff --git a/tools/flang1/flang1exe/rte.c b/tools/flang1/flang1exe/rte.c
@@ -340,7 +340,11 @@ sym_get_sdescr(int sptr, int rank)
   DTYPEP(sdsc, dtype);
   STYPEP(sdsc, ST_DESCRIPTOR);
   DCLDP(sdsc, 1);
-  SCP(sdsc, rte_sc);
+  if (flg.omptarget && rte_sc == SC_LOCAL) {
+    SCP(sdsc, SC_STATIC);
+  } else {
+    SCP(sdsc, rte_sc);
+  }
   NODESCP(sdsc, 1);
   DESCARRAYP(sdsc, 1); /* used in detect.c */
   if (DTY(DTYPEG(sptr)) == TY_PTR || IS_PROC_DUMMYG(sptr)) {

diff --git a/tools/flang1/flang1exe/semsmp.c b/tools/flang1/flang1exe/semsmp.c
@@ -8487,6 +8487,7 @@ do_map()
       // This is used when obj%p is mapped using map clause
       if(A_TYPEG(item->ast) == A_MEM &&
               POINTERG(A_SPTRG(A_MEMG(item->ast))) &&
+              !POINTERG(A_SPTRG(A_PARENTG(item->ast))) &&
               SCG(A_SPTRG(A_MEMG(item->ast))) == SC_BASED) {
         past = get_cc_pointer(A_SPTRG(A_PARENTG(item->ast)),
                                     A_SPTRG(A_MEMG(item->ast)));