Merge pull request #790 from ThePortlandGroup/nv_stage

Pull 2019-08-28T15-45 Recent NVIDIA Changes

Author: sscalpone

tools/flang1/flang1exe/semfunc.c

@@ -2111,7 +2111,8 @@ gen_pointer_result(int array_value, int dscptr, int nactuals,
     MIDNUMP(arr_tmp, pvar);
     NODESCP(arr_tmp, 0);
     ddt = DDTG(dt);
-    if (DTY(dt) == TY_CHAR || DTY(dt) == TY_NCHAR) {
+    if ((DTY(dt) == TY_CHAR && dt != DT_DEFERCHAR) ||
+        (DTY(dt) == TY_NCHAR && dt != DT_DEFERNCHAR)) {
       add_auto_len(arr_tmp, 0);
       if (CVLENG(arr_tmp))
         ERLYSPECP(CVLENG(arr_tmp), 1);

tools/flang2/flang2exe/cgllvm.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2018, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2010-2019, NVIDIA CORPORATION.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,10 +26,10 @@
 
 void cprintf(char *s, const char *format, INT *val);
 
-#define SNAME(sptr) (sptr_array[sptr])
-#define LLTYPE(sptr) (sptr_type_array[sptr])
-#define LLTYPE_kind(sptr) (sptr_type_array[sptr]->kind)
-#define LLTYPE_size(sptr) (sptr_type_array[sptr]->size)
+#define SNAME(sptr) (sptrinfo.array.stg_base[sptr])
+#define LLTYPE(sptr) (sptrinfo.type_array.stg_base[sptr])
+#define LLTYPE_kind(sptr) (sptrinfo.type_array.stg_base[sptr]->kind)
+#define LLTYPE_size(sptr) (sptrinfo.type_array.stg_base[sptr]->size)
 
 #define AGGREGATE_STYPE(s) \
   ((s) == ST_STRUCT || (s) == ST_UNION || (s) == ST_ARRAY)
@@ -104,8 +104,12 @@ typedef enum {
 
 #define IS_OLD_STYLE_CAND(s) (DEFDG(sptr) || CCSYMG(sptr))
 
-extern char **sptr_array;
-extern LL_Type **sptr_type_array;
+typedef struct{
+    STG_DECLARE(array, char*);
+    STG_DECLARE(type_array, LL_Type*);
+}SPTRINFO_T;
+
+extern SPTRINFO_T sptrinfo;
 
 void cg_llvm_init(void);
 void cg_llvm_end(void);

tools/flang2/flang2exe/cgmain.cpp

@@ -34,6 +34,7 @@
 #include "llutil.h"
 #include "lldebug.h"
 #include "go.h"
+#include "sharedefs.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include "llassem.h"
@@ -193,15 +194,15 @@ static unsigned addressElementSize;
 
 /* Exported variables */
 
-char **sptr_array = NULL;
+SPTRINFO_T sptrinfo;
 
 /* This should live in llvm_info, but we need to access this module from other
  * translation units temporarily */
 LL_Module *cpu_llvm_module = NULL;
 #ifdef OMP_OFFLOAD_LLVM
 LL_Module *gpu_llvm_module = NULL;
 #endif
-LL_Type **sptr_type_array = NULL;
+
 
 /* File static variables */
 
@@ -13056,10 +13057,6 @@ static void
 update_llvm_sym_arrays(void)
 {
   const int new_size = stb.stg_avail + MEM_EXTRA;
-  int old_last_sym_avail = llvm_info.last_sym_avail; // NEEDB assigns
-  NEEDB(stb.stg_avail, sptr_array, char *, llvm_info.last_sym_avail, new_size);
-  NEEDB(stb.stg_avail, sptr_type_array, LL_Type *, old_last_sym_avail,
-        new_size);
   if ((flg.debug || XBIT(120, 0x1000)) && cpu_llvm_module) {
     lldbg_update_arrays(cpu_llvm_module->debug_info, llvm_info.last_dtype_avail,
                         stb.dt.stg_avail + MEM_EXTRA);
@@ -13107,11 +13104,14 @@ cg_llvm_init(void)
   /* last_sym_avail is used for all the arrays below */
   llvm_info.last_sym_avail = stb.stg_avail + MEM_EXTRA;
 
-  NEW(sptr_array, char *, stb.stg_avail + MEM_EXTRA);
-  BZERO(sptr_array, char *, stb.stg_avail + MEM_EXTRA);
-  /* set up the type array shadowing the symbol table */
-  NEW(sptr_type_array, LL_Type *, stb.stg_avail + MEM_EXTRA);
-  BZERO(sptr_type_array, LL_Type *, stb.stg_avail + MEM_EXTRA);
+  if (sptrinfo.array.stg_base) {
+    STG_CLEAR_ALL(sptrinfo.array);
+    STG_CLEAR_ALL(sptrinfo.type_array);
+  } else {
+    STG_ALLOC_SIDECAR(stb, sptrinfo.array);
+    /* set up the type array shadowing the symbol table */
+    STG_ALLOC_SIDECAR(stb, sptrinfo.type_array);
+  }
 
   Globals = NULL;
   recorded_Globals = NULL;

tools/flang2/flang2exe/expand.cpp

@@ -494,9 +494,17 @@ eval_ilm(int ilmx)
      * For each operand which is a link to another ilm, recurse (evaluate it)
      * if not already evaluated
      */
-    for (tmp = 1, noprs = ilms[opcx].oprs; noprs > first_op; ++tmp, --noprs) {
-      if (IM_OPRFLAG(opcx, noprs) == OPR_LNK) {
-        eval_ilm_argument1(noprs, ilmpx, ilmx);
+    if (opcx == IM_DCMPLX || opcx == IM_CMPLX) {
+      for (tmp = 1, noprs = 1; noprs <= ilms[opcx].oprs; ++tmp, ++noprs) {
+        if (IM_OPRFLAG(opcx, noprs) == OPR_LNK) {
+          eval_ilm_argument1(noprs, ilmpx, ilmx);
+        }
+      }
+    } else {
+      for (tmp = 1, noprs = ilms[opcx].oprs; noprs > first_op; ++tmp, --noprs) {
+        if (IM_OPRFLAG(opcx, noprs) == OPR_LNK) {
+          eval_ilm_argument1(noprs, ilmpx, ilmx);
+        }
       }
     }
 

tools/flang2/flang2exe/lldebug.cpp

@@ -3118,19 +3118,19 @@ lldbg_function_end(LL_DebugInfo *db, int func)
     if (!REFG(i)) {
       // generate unreferenced variables
       // add these to DWARF output as <optimized out> variables
-      LL_Type *cache = sptr_type_array[i];
+      LL_Type *cache = LLTYPE(i);
       const DTYPE dtype = DTYPEG(i);
       process_dtype_struct(dtype); // make sure type is emitted
       type = make_lltype_from_dtype(dtype);
       value = ll_create_value_from_type(db->module, type, "undef");
       lldbg_emit_global_variable(db, i, 0, 1, value);
-      sptr_type_array[i] = cache;
+      LLTYPE(i) = cache;
     } else if ((!SNAME(i)) && REFG(i)) {
       // add referenced variables not discovered as yet
       const char *sname;
       const char *name;
       char *buff;
-      LL_Type *cache = sptr_type_array[i];
+      LL_Type *cache = LLTYPE(i);
       const DTYPE dtype = DTYPEG(i);
       process_dtype_struct(dtype); // make sure type is emitted
       type = ll_get_pointer_type(make_lltype_from_dtype(dtype));
@@ -3142,7 +3142,7 @@ lldbg_function_end(LL_DebugInfo *db, int func)
       sprintf(buff, "bitcast (%%struct%s* @%s to %s)", sname, name, type->str);
       value = ll_create_value_from_type(db->module, type, (const char *)buff);
       lldbg_emit_global_variable(db, i, 0, 1, value);
-      sptr_type_array[i] = cache;
+      LLTYPE(i) = cache;
     }
   }
 }