Merge pull request #516 from ThePortlandGroup/nv_stage

Pull 2018-06-27T16-24 Recent NVIDIA Changes

Author: sscalpone

include/flang/Error/errmsg-accel.n

@@ -26,3 +26,19 @@
 .MS S 1014 "Global Threadprivate variables are not supported - $"
 .\" skipping to keep same numbers as Fortran front-end
 .MS S 1100 "Cannot collapse non-tightly-nested loops"
+.MS F 1015 "No shape directive is defined in structure $"
+.MS F 1016 "No shape name $ is defined in structure $"
+.MS F 1017 "arrays/pointers appearing in the OpenACC shape and policy directives must be a member of current aggregate type"
+.MS F 1018 "Only one unnamed Shape directive is allowed in one aggregate type (struct/union)"
+.MS F 1019 "Type clause must be used to specified structure type when Shape/Policy is defined outside (struct/union/class) definition"
+.MS F 1020 "Data-Type appearing in type clause cannot be found"
+.MS F 1021 "Data-Type appearing in type clause must be struct/union type"
+.MS F 1022 "Duplicated shape names $ are defined for structure/union/class $"
+.MS F 1023 "Duplicated policy names $ are defined for structure/union/class $"
+.MS F 1024 "Type clause is not allowed within structure/union/class definition"
+.MS F 1025 "The number of dimension section descriptions doesn't match member $ which requires $ dimensions"
+.MS F 1026 "Pointers appearing within relative clause must be their sibling members"
+.MS F 1027 "As motion clauses, only create, copyin, copyout, copy, update, and deviceptr are allowed in policy directive"
+.MS F 1028 "The variable $ doesn't have predefined policy $ available"
+.MS F 1029 "The variable $ using policy $ is not a structure-based type"
+.MS F 1030 "Policy motion $ is not allowed in $ directive"

runtime/flangmain/flangmain.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 1998-2018, 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.
@@ -27,7 +27,7 @@ extern char **__io_environ();
 extern void __io_set_argc(int);
 extern void __io_set_argv(char **);
 
-#if defined(PGDLL) && defined(WINNT) && !defined(WIN64) && !defined(WIN32)
+#if defined(PGDLL) && defined(WINNT) && !defined(WIN64)
 struct {
   char *pghpf_01p;
   char *pghpf_02p;
@@ -51,31 +51,21 @@ char *__get_fort_0c_addr(void);
 char *__get_fort_type_addr(void);
 #endif
 
-int main(argc, argv) int argc;
-char **argv;
+int main(int argc, char** argv)
 {
   int i = 0;
 
-#if (defined(INTERIX86) || defined(INTERIX8664) || defined(WIN64) ||           defined(WIN32) || defined(TARGET_OSX_X86))
-  _pgimain(argc, argv);
-#endif
-
   __io_set_argc(argc);
   __io_set_argv(argv);
 
-#if   defined(WINNT) && !defined(WIN64) && !defined(WIN32)
-#if defined(PGDLL)
+#if defined(PGDLL) && defined(WINNT) && !defined(WIN64)
   pghpf_0.pghpf_01p = __get_fort_01_addr();
   pghpf_0.pghpf_02p = __get_fort_02_addr();
   pghpf_0.pghpf_03p = __get_fort_03_addr();
   pghpf_0.pghpf_04p = __get_fort_04_addr();
   pghpf_0c.pghpf_0cp = __get_fort_0c_addr();
   pg_type.pg_typep = __get_fort_type_addr();
 #endif
-  MAIN(argc, argv, __io_environ());
-  ENTF90(EXIT, exit)(&i);
-#else
   MAIN_(argc, argv, __io_environ());
   ENTF90(EXIT, exit)(&i);
-#endif
 }

tools/flang1/flang1exe/semsmp.c

@@ -3753,7 +3753,7 @@ semsmp(int rednum, SST *top)
     bttype = BT_ACCKERNELS | BT_ACCKDO;
     dirname = "ACC KERNELS DO";
     pr1 = PR_ACCKERNELS;
-    pr2 = PR_ACCKLOOP;
+    pr2 = PR_ACCTKLOOP;
     dignorenested = TRUE;
     goto ACCEL_ENTER_REGION;
   /*
@@ -3765,7 +3765,7 @@ semsmp(int rednum, SST *top)
     bttype = BT_ACCKERNELS | BT_ACCKLOOP;
     dirname = "ACC KERNELS LOOP";
     pr1 = PR_ACCKERNELS;
-    pr2 = PR_ACCKLOOP;
+    pr2 = PR_ACCTKLOOP;
     dignorenested = TRUE;
   ACCEL_ENTER_REGION:
     SST_ASTP(LHS, 0);
@@ -3780,7 +3780,7 @@ semsmp(int rednum, SST *top)
     bttype = BT_ACCPARALLEL | BT_ACCPDO;
     dirname = "ACC PARALLEL DO";
     pr1 = PR_ACCPARCONSTRUCT;
-    pr2 = PR_ACCPLOOP;
+    pr2 = PR_ACCTPLOOP;
     dignorenested = TRUE;
     goto ACCEL_ENTER_REGION;
   /*
@@ -3793,7 +3793,7 @@ semsmp(int rednum, SST *top)
     bttype = BT_ACCPARALLEL | BT_ACCPLOOP;
     dirname = "ACC PARALLEL LOOP";
     pr1 = PR_ACCPARCONSTRUCT;
-    pr2 = PR_ACCPLOOP;
+    pr2 = PR_ACCTPLOOP;
     dignorenested = TRUE;
     goto ACCEL_ENTER_REGION;
   /*
@@ -4158,7 +4158,7 @@ semsmp(int rednum, SST *top)
     bttype = BT_ACCSERIAL | BT_ACCSLOOP;
     dirname = "ACC SERIAL LOOP";
     pr1 = PR_ACCSERIAL;
-    pr2 = PR_ACCSLOOP;
+    pr2 = PR_ACCTSLOOP;
     dignorenested = TRUE;
     goto ACCEL_ENTER_REGION;
     /*

tools/flang1/flang1exe/symacc.c

@@ -60,7 +60,6 @@ sym_init_first(void)
     assert(stb.n_base, "sym_init: no room for namtab", stb.n_size, ERR_Fatal);
     stb.n_base[0] = 0;
     STG_ALLOC(stb.dt, 400);
-    STG_ALLOC_SIDECAR(stb.dt, stb.dt_shapemap);
     assert(stb.dt.stg_base, "sym_init: no room for dtypes", stb.dt.stg_size, ERR_Fatal);
     /* basically, this is sidecar of dt_base */
 
@@ -69,16 +68,6 @@ sym_init_first(void)
     assert(stb.w_base, "sym_init: no room for wtab", stb.w_size, ERR_Fatal);
   }
   /* allocate  deepcopy info */
-  if(stb.dpinfo.stg_base == NULL) {
-    STG_ALLOC(stb.dpinfo, 1000);
-    STG_ALLOC(stb.dpdim, 1000);
-    STG_ALLOC(stb.dpreg, 1000);
-  }
-  
-  if(stb.dppolicyidx.stg_base == NULL) {
-    STG_ALLOC(stb.dppolicyidx, 1000);
-    STG_ALLOC(stb.dppolicymem, 1000);
-  }
 
   stb.namavl = 1;
   stb.wrdavl = 0;
@@ -506,3 +495,4 @@ symini_interr(const char *txt, int val, int sev)
   sprintf(buff, "%7d", val);
   symini_error(0, sev, gbl.lineno, txt, buff);
 }
+

tools/flang1/flang1exe/symacc.h

@@ -102,64 +102,6 @@ void realloc_sym_storage();
 #define NEWSYM(sptr)         \
   sptr = (SPTR)STG_NEXT(stb);
 
-#define NEWDPSHAPE(ishape)         \
-  ishape = STG_NEXT(stb.dpinfo);
-
-#define NEWDPMEMDIM(imemid)         \
-  imemid = STG_NEXT(stb.dpdim);
-
-#define NEWDPSUBREG(isubid)         \
-  isubid = STG_NEXT(stb.dpreg);
-
-#define NEWDPPOLICYIDX(ipolicyid) \
-  ipolicyid = STG_NEXT(stb.dppolicyidx);
-
-#define NEWDPPOLICYMEM(ipolicymemid) \
-  ipolicymemid = STG_NEXT(stb.dppolicymem);
-
-#define DP_FIRSTSHAPE(dtype)  stb.dt_shapemap.stg_base[dtype]
-#define DP_FIRSTPOLICY(dtype) stb.dt_shapemap.stg_base[dtype+1]
-/* if this structure/union type, does it include any dynamic member
- * in this descendants */
-#define DP_INCLUDEDYN(dtype) stb.dt_shapemap.stg_base[dtype+2]
-#define DP_INCDYN_FLG_UNSET	(0)
-#define DP_INCDYN_FLG_HASDYN	(1)
-#define DP_INCDYN_FLG_NODYN	(2)
-
-#define DP_SHAPE_NEXT(ishape)  stb.dpinfo.stg_base[ishape].next
-#define DP_SHAPE_NAME(ishape)  stb.dpinfo.stg_base[ishape].sptr
-#define DP_SHAPE_LINENO(ishape)  stb.dpinfo.stg_base[ishape].lineno
-#define DP_SHAPE_PARENT_TYPE(ishape)  stb.dpinfo.stg_base[ishape].typeidx
-#define DP_SHAPE_PARENT_TNAME(ishape)  stb.dpinfo.stg_base[ishape].typesptr
-#define DP_SHAPE_INEX(ishape)  stb.dpinfo.stg_base[ishape].inex
-#define DP_SHAPE_1ST_MEMID(ishape) stb.dpinfo.stg_base[ishape].memid
-
-#define DP_MEMID_MAP_SPTR(memid) stb.dpdim.stg_base[memid].sptr
-#define DP_MEMID_LINENO(memid) stb.dpdim.stg_base[memid].lineno
-#define DP_MEMID_TYPE(memid) stb.dpdim.stg_base[memid].type
-#define DP_MEMID_NEXT(memid)      stb.dpdim.stg_base[memid].next
-#define DP_MEMID_1ST_SUBREGION(memid)  stb.dpdim.stg_base[memid].subregion
-
-#define DP_SUBREGION_LOW(isubid)	stb.dpreg.stg_base[isubid].low
-#define DP_SUBREGION_LOW_TYPE(isubid)   stb.dpreg.stg_base[isubid].lowtype
-#define DP_SUBREGION_HIGH(isubid)       stb.dpreg.stg_base[isubid].upper
-#define DP_SUBREGION_HIGH_TYPE(isubid)  stb.dpreg.stg_base[isubid].uppertype
-#define DP_SUBREGION_NEXT(isubid)       stb.dpreg.stg_base[isubid].next
-
-#define DP_POLICY_NAME(ipolicyid)         stb.dppolicyidx.stg_base[ipolicyid].sptr
-#define DP_POLICY_SHAPEID(ipolicyid)         stb.dppolicyidx.stg_base[ipolicyid].shapeid
-#define DP_POLICY_LINENO(ipolicyid)         stb.dppolicyidx.stg_base[ipolicyid].lineno
-#define DP_POLICY_PARENT_TYPE(ipolicyid)  stb.dppolicyidx.stg_base[ipolicyid].typeidx
-#define DP_POLICY_PARENT_TNAME(ipolicyid)  stb.dppolicyidx.stg_base[ipolicyid].typesptr
-#define DP_POLICY_1ST_MEMID(ipolicyid)  stb.dppolicyidx.stg_base[ipolicyid].memid
-#define DP_POLICY_INEX_FLAG(ipolicyid)         stb.dppolicyidx.stg_base[ipolicyid].inex
-#define DP_POLICY_NEXT(ipolicyid)  stb.dppolicyidx.stg_base[ipolicyid].next
-
-#define DP_POLICYMEM_NAME(ipolicymemid)		stb.dppolicymem.stg_base[ipolicymemid].sptr
-#define DP_POLICYMEM_MOTION_TYPE(ipolicymemid)	stb.dppolicymem.stg_base[ipolicymemid].mtype
-#define DP_POLICYMEM_POLICYIDX(ipolicymemid)	stb.dppolicymem.stg_base[ipolicymemid].policyidx
-#define DP_POLICYMEM_NEXT(ipolicymemid)		stb.dppolicymem.stg_base[ipolicymemid].next
-
 #define LINKSYM(sptr, hashval)        \
   HASHLKP(sptr, stb.hashtb[hashval]); \
   stb.hashtb[hashval] = sptr
@@ -232,102 +174,6 @@ typedef struct SYM {
   INT w40;
 } SYM;
 
-typedef struct DPSHAPE {
-   int sptr; /*name of current shape*/
-   int typeidx; /* this is type in which shape dir applies */
-   int typesptr;  /* parent type name, DTYPEG(typesptr)
-                   * should equal to typeidx */        
-   int memid; /* shape info for the first mem*/
-   /* default(include/exclude) clause 
-    * 0: default clause not appear 
-    * 1: default is include
-    * 2: default is exclude */
-   int inex; 
-   int lineno;
-   int next; /* next shape */
-}DPSHAPE;
-
-typedef enum ACC_DP_SH_TYPE {
-  ACC_DP_SH_TUNKNOWN = 0,
-  ACC_DP_SH_TARRAY_SD, /* array section description */
-  ACC_DP_SH_TINIT_NEEDED,
-  ACC_DP_SH_RELATIVE
-}ACC_DP_SH_TYPE;
-
-typedef struct DPMEMDIM {
-   int sptr; /* entry to the name of struct/union/class member */
-   /* if sptr is a scalar, subregion is 0 
-    * it means this scalar var is init_needed */
-   int subregion;
-   int lineno;
-   int type;
-   int next;
-}DPMEMDIM;
-
-typedef enum DPBNDTYPE {
-  DP_BND_UNKNOWN,
-  DP_BND_CONST, /* compilation time known constant */
-  DP_BND_SIBLING_MEM, /* sibling scalar members */
-  DP_BND_GBL_VAR, /* global variable which will be translated into ptr */
-  DP_BND_EXP,	/* it is an expression. */
-  DP_BND_TAG    /* it is only used to identify pointers 
-		 * in relative clause (not start ptr) */   
-}DPBNDTYPE;
-
-typedef struct DPSUBREG {
-   int low; /* constant */
-   DPBNDTYPE lowtype; /* const, sibling mem entry, expression */
-   int upper;
-   DPBNDTYPE uppertype; /* const, sibling mem entry, expression */
-   int next; /* next dimensional info */
-}DPSUBREG;
-
-typedef enum ACC_DP_DEFAULTVALUE {
-  ACC_DP_DEFAULT_NONE=0,
-  ACC_DP_DEFAULT_INCLUDE,
-  ACC_DP_DEFAULT_EXCLUDE
-}ACC_DP_DEFAULTVALUE;
-
-typedef struct DP_POLICY_IDX {
-   int sptr; /* policy name */
-   int shapeid; /* which shape is used by this policy directive */
-   int typeidx; /* this is type in which policy is declared */
-   int typesptr; /* parent type name, DTYPEG(typesptr) 
-                  * should equal to typeidx */        
-   int memid; /* first member */
-   /* default(include/exclude) clause 
-    * 0: default clause not appear 
-    * 1: default is include
-    * 2: default is exclude */
-   int inex; 
-   int lineno;
-   int next; /* next policy */
-}DP_POLICY_IDX;
-
-/* deepcopy policy motion type 
- * If this order is changed, the same order
- * must be changes in runtime unified.h */
-typedef enum DP_POLICY_MTYPE {
-  ACC_DP_UNKNOWN=0,
-  ACC_DP_COPYIN,
-  ACC_DP_COPYOUT,
-  ACC_DP_COPY,
-  ACC_DP_CREATE,
-  ACC_DP_UPDATE,
-  ACC_DP_DEVPTR,
-  ACC_DP_NOCREATE, /* NOT IMPLEMENT */
-  ACC_DP_PRESENT   /* NOT IMPLEMENT */
-}DP_POLICY_MTYPE;
-
-/* Policy Members */
-typedef struct DP_POLICY_MEM {
-   int sptr; /* member name */
-   DP_POLICY_MTYPE mtype; /* motion type */
-   int policyidx;
-   int lineno;
-   int next; /* next mem in this policy */
-}DP_POLICY_MEM;
-
 /*   symbol table data declarations:  */
 typedef struct {
   const char *stypes[ST_MAX + 1];
@@ -345,24 +191,10 @@ typedef struct {
   struct{
     STG_MEMBERS(ISZ_T);
   }dt;
-  struct{
-    STG_MEMBERS(ISZ_T);
-  }dt_shapemap;
   int curr_scope;
   SPTR hashtb[HASHSIZE + 1];
   SPTR firstusym, firstosym;
   STG_MEMBERS(SYM);
-  /* shape info for aggregate data type */
-  STG_DECLARE(dpinfo, DPSHAPE);
-  /* deepcopy dimensional info for each mem in a data type 
-   * it points entries in dpreg */
-  STG_DECLARE(dpdim, DPMEMDIM);
-  /* low/upper bound of each dim */
-  STG_DECLARE(dpreg, DPSUBREG); 
-  /* Policy ID */
-  STG_DECLARE(dppolicyidx, DP_POLICY_IDX);
-  /* Mem motion definition in the policy directive */
-  STG_DECLARE(dppolicymem, DP_POLICY_MEM);
   char *n_base;
   int n_size;
   int namavl;

tools/flang2/flang2exe/exp_ftn.c

@@ -4113,8 +4113,17 @@ exp_misc(ILM_OP opc, ILM *ilmp, int curilm)
       break;
     case PR_ACCKLOOP:
       break;
+    case PR_ACCTKLOOP:
+      break;
     case PR_ACCPLOOP:
       break;
+    case PR_ACCTPLOOP:
+      break;
+    case PR_ACCSLOOP:
+    case PR_ACCTSLOOP:
+      /* don't need anything at this for the a
+       * loop clause in a serial construct */
+      break;
     case PR_ACCUPDATE:
       break;
     case PR_ACCSHORTLOOP:

tools/flang2/flang2exe/ilmutil.c

@@ -927,6 +927,7 @@ _dumponeilm(ILM_T *ilm_base, int i, int check)
     case IM_PRAGMAEXPR:
     case IM_PRAGMASYMEXPR:
     case IM_PRAGMASELIST:
+    case IM_PRAGMADPSELIST:
     case IM_PRAGMAGEN:
       switch (pr) {
       case PR_NONE:

tools/flang2/flang2exe/mwd.c

@@ -3136,6 +3136,7 @@ dumpdtypes(void)
     dumpdtype(dtype);
   }
   fprintf(dfile, "\n");
+  
 } /* dumpdtypes */
 
 void

tools/flang2/flang2exe/mwd.h

@@ -753,6 +753,26 @@ void printblocksline(void);
  */
 void printblocks(void);
 
+/**
+   \brief ...
+ */
+void dumpdpshape(int shapeid);
+
+/**
+   \brief ...
+ */
+void dumpdppolicy(int policyid);
+
+/**
+   \brief ...
+ */
+void dumpdpshapes();
+
+/**
+   \brief ...
+ */
+void dumpdppolicies();
+
 /**
    \brief ...
  */