Minor changes to OpenMP offload utilities

Author: gklimowicz

tools/flang2/flang2exe/tgtutil.cpp

@@ -140,47 +140,6 @@ ld_sptr(SPTR sptr)
       return ad3ili(IL_LD, ili, nme, mem_size(DTY(DTYPEG(sptr))));
   }
 }
-static char*
-getSPTRname(SPTR sptr){
-  char* name;
-  if(ST_CONST == STYPEG(sptr)) {
-    NEW(name, char, 100);
-    sprintf(name, "%d", CONVAL2G(sptr));
-    return name;
-  }
-  return getprint(sptr);
-}
-static char*
-getILIname(int ili)
-{
-  ILI_OP op = ilib.stg_base[ili].opc;
-  char *name, *fname;
-  switch(op)
-  {
-    case IL_ACON:
-    case IL_ICON:
-      return getSPTRname(ILI_SymOPND(ili, 1));
-    case IL_DFRIR:
-      name = getSPTRname(ILI_SymOPND((ILI_SymOPND(ili,1)),1));
-      NEW(fname, char, strlen(name)+5);
-      sprintf(fname,"%s()", name);
-      return fname;
-    case IL_LD:
-    case IL_LDA:
-    case IL_LD256:
-    case IL_LDDCMPLX:
-    case IL_LDDP:
-    case IL_LDHP:
-    case IL_LDKR:
-    case IL_LDQ:
-    case IL_LDQU:
-    case IL_LDSP:
-        return getSPTRname(NME_SYM(ILI_SymOPND(ili, 2)));
-      default:
-        return "[symbol name cannot be printed]";
-  }
-  return "[symbol name cannot be printed]";
-}
 
 #define TGT_CHK(_api) \
   (((_api) > TGT_API_BAD && (_api) < TGT_API_N_ENTRIES) ? _api : TGT_API_BAD)
@@ -387,7 +346,6 @@ tgt_target_fill_params(SPTR arg_base_sptr, SPTR arg_size_sptr, SPTR args_sptr,
                        SPTR args_maptypes_sptr, OMPACCEL_TINFO *targetinfo)
 {
   int i, j, ilix, iliy;
-  char *name_base="", *name_length="";
   OMPACCEL_SYM midnum_sym;
   DTYPE param_dtype, load_dtype;
   SPTR param_sptr;
@@ -439,18 +397,14 @@ tgt_target_fill_params(SPTR arg_base_sptr, SPTR arg_size_sptr, SPTR args_sptr,
       else if (llis_pointer_kind(param_dtype))
         param_dtype = DTySeqTyElement(param_dtype);
       iliy = targetinfo->symbols[i].ili_base;
-      ilix = mk_ompaccel_store(iliy, DT_ADDR, nme_base,
-                               ad_acon(arg_base_sptr, i * TARGET_PTRSIZE));
+      ilix = mk_ompaccel_store(iliy, DT_ADDR, nme_base, ad_acon(arg_base_sptr, i * TARGET_PTRSIZE));
       /* Assign args */
       chk_block(ilix);
-      ilix = ad1ili(IL_IKMV, targetinfo->symbols[i].ili_lowerbound);
-      ilix = mk_ompaccel_mul(ilix, DT_INT8, ad_kconi(size_of(param_dtype)),
-                             DT_INT8);
-      ilix = ad1ili(IL_KAMV, ilix);
+      ilix = ikmove(targetinfo->symbols[i].ili_lowerbound);
+      ilix = mk_ompaccel_mul(ilix, DT_INT8, ad_kconi(size_of(param_dtype)), DT_INT8);
+      ilix = sel_aconv(ilix);
       ilix = mk_ompaccel_add(iliy, DT_ADDR, ilix, DT_INT8);
-      ilix = mk_ompaccel_store(ilix, DT_ADDR, nme_args,
-                               ad_acon(args_sptr, i * TARGET_PTRSIZE));
-      name_base = getILIname(targetinfo->symbols[i].ili_lowerbound);
+      ilix = mk_ompaccel_store(ilix, DT_ADDR, nme_args, ad_acon(args_sptr, i * TARGET_PTRSIZE));
       chk_block(ilix);
     } else {
       /* Optimization - Pass by value for scalar */
@@ -472,7 +426,6 @@ tgt_target_fill_params(SPTR arg_base_sptr, SPTR arg_size_sptr, SPTR args_sptr,
     if(targetinfo->symbols[i].in_map) {
       ilix = ikmove(targetinfo->symbols[i].ili_length);
       ilix = mk_ompaccel_mul(ilix, DT_INT8, ad_kconi(size_of(param_dtype)), DT_INT8);
-      name_length = getILIname(targetinfo->symbols[i].ili_length);
     } else {
       if(isMidnum)
         ilix = _tgt_target_fill_size(midnum_sym.host_sym, targetinfo->symbols[i].map_type);