Merge pull request #792 from ThePortlandGroup/nv_stage

Pull 2019-08-29T14-52 Recent NVIDIA Changes

Author: sscalpone

runtime/flang/CMakeLists.txt

@@ -495,6 +495,17 @@ add_flang_library(flang_shared
   ${SHARED_SOURCES}
   )
 set_property(TARGET flang_shared PROPERTY OUTPUT_NAME flang)
+
+#
+# Seralize the building of flang_shared and flang_static to eliminate
+# conflicts with the same module files from the shared and static builds
+# being created/recreated in the common directory
+# ${CMAKE_Fortran_MODULE_DIRECTORY}.
+#
+# Note: building of each library is still parallelized.
+#
+add_dependencies(flang_shared flang_static)
+
 target_link_libraries(flang_shared ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib/libflangrti.so)
 # Resolve symbols against libm and librt
 target_link_libraries(flang_shared m rt)

runtime/libpgmath/lib/common/sincos/fd_sincos_scalar.cpp

@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) 2018, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2018-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.
@@ -179,9 +179,6 @@ __attribute__((noinline)) FCN_NAME(double const x)
 
 
 #if     defined(SINCOS)
-#if     defined(CMPLX)
-    return CMPLX(rs, rc);
-#else
     struct {
         union {
             double _Complex c;
@@ -192,7 +189,6 @@ __attribute__((noinline)) FCN_NAME(double const x)
     ret_cmplx.d[1] = rc;
 
     return ret_cmplx.c;
-#endif
 #else
     S(return rs;)
     C(return rc;)

tools/flang1/flang1exe/func.c

@@ -6235,6 +6235,19 @@ inline_reduction_f90(int ast, int dest, int lc, LOGICAL *doremove)
       astsubscrtmp = dest;
     } else
       astsubscrtmp = asttmp;
+    if (A_OPTYPEG(ast) == I_MAXLOC || A_OPTYPEG(ast) == I_MINLOC ||
+        A_OPTYPEG(ast) == I_MAXVAL || A_OPTYPEG(ast) == I_MINVAL) {
+      /* if the expression being reduced is nontrivial, assign to a temp */
+      if (A_TYPEG(ast2) == A_SUBSCR || A_TYPEG(ast2) == A_ID) {
+      } else {
+        /* create a temporary scalar */
+        int temprhs = sym_get_scalar(SYMNAME(sptr), "l", dtyperes);
+        /* assign the RHS to temprhs */
+        int std = mk_assn_stmt(mk_id(temprhs), ast2, dtyperes);
+        add_stmt_before(std, stdnext);
+        ast2 = mk_id(temprhs);
+      }
+    }
   }
   dtsclr = DDTG(dtypetmp);
   switch (A_OPTYPEG(ast)) {

tools/flang1/flang1exe/semant.c

@@ -2748,19 +2748,11 @@ semant1(int rednum, SST *top)
    *	<end stmt> ::= <END stmt>    |
    */
   case END_STMT1:
-    if (sem.interface && !gbl.rutype) {
-      error(310, 3, gbl.lineno, "Missing ENDINTERFACE statement", CNULL);
-    } else if (sem.interface) {
-      if (flg.standard) {
-        error(155, 3, gbl.lineno,
-              "END statement for  interface procedure must be END",
-              name_of_rutype(gbl.rutype));
-      } else {
-        error(155, 2, gbl.lineno,
-              "END statement for internal procedure should be END",
-              name_of_rutype(gbl.rutype));
-      }
-    }
+    if (sem.interface && !gbl.rutype)
+        error(310, 3, gbl.lineno, "Missing ENDINTERFACE statement", CNULL);
+    else if (sem.which_pass)
+      fix_class_args(gbl.currsub);
+
     dummy_program();
     if (IN_MODULE_SPEC && gbl.internal == 0)
       goto end_of_module;

tools/flang2/docs/xflag.n

@@ -1186,6 +1186,8 @@ when the loop-end condition is a known 'distance' away from the initial value
 of the pointer
 .XB 0x400
 Disable scalar replacement for invariant array references within loops.
+.XB 0x800
+reserved.
 
 .XF "30-39"
 Reserved for low-level vectorizer.