Merge pull request #594 from ThePortlandGroup/nv_stage

Pull 2018-09-21T05-56 Recent NVIDIA Changes
flang-compiler · Sep 21, 2018 · 498be06 · 498be06
2 parents 36782ba + b4a498a
commit 498be06
Show file tree

Hide file tree

Showing 57 changed files with 4,287 additions and 3,611 deletions.
diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
@@ -27,6 +27,7 @@ add_definitions(
  -DPGFLANG
  -DNATIVE_FPCVT
  -DPGI_LITTLE_ENDIAN
+ -DINLINE_MEMOPS
 )
 
 if( ${TARGET_ARCHITECTURE} STREQUAL "x86_64" )

diff --git a/runtime/flang/mmcmplx16.c b/runtime/flang/mmcmplx16.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2012-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.
@@ -539,19 +539,19 @@ void ENTF90(MMUL_CMPLX16,
       tindex -= 2;
     switch (tindex) {
     case 0:
-      ftn_mnaxnb_cmplx16_(&ta, &tb, &mra, &ncb, &kab, alpha, a, &lda, b, &ldb,
+      ftn_mnaxnb_cmplx16_(&mra, &ncb, &kab, alpha, a, &lda, b, &ldb,
                             beta, c, &ldc);
       break;
     case 1:
-      ftn_mtaxnb_cmplx16_(&ta, &tb, &mra, &ncb, &kab, alpha, a, &lda, b, &ldb,
+      ftn_mtaxnb_cmplx16_(&mra, &ncb, &kab, alpha, a, &lda, b, &ldb,
                             beta, c, &ldc);
       break;
     case 2:
-      ftn_mnaxtb_cmplx16_(&ta, &tb, &mra, &ncb, &kab, alpha, a, &lda, b, &ldb,
+      ftn_mnaxtb_cmplx16_(&mra, &ncb, &kab, alpha, a, &lda, b, &ldb,
                             beta, c, &ldc);
       break;
     case 3:
-      ftn_mtaxtb_cmplx16_(&ta, &tb, &mra, &ncb, &kab, alpha, a, &lda, b, &ldb,
+      ftn_mtaxtb_cmplx16_(&mra, &ncb, &kab, alpha, a, &lda, b, &ldb,
                             beta, c, &ldc);
     }
   }

diff --git a/runtime/flang/mmcmplx8.c b/runtime/flang/mmcmplx8.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2012-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.
@@ -538,19 +538,19 @@ void ENTF90(MMUL_CMPLX8,
       tindex -= 2;
     switch (tindex) {
     case 0:
-      ftn_mnaxnb_cmplx8_(&ta, &tb, &mra, &ncb, &kab, alpha, a, &lda, b, &ldb,
+      ftn_mnaxnb_cmplx8_(&mra, &ncb, &kab, alpha, a, &lda, b, &ldb,
                            beta, c, &ldc);
       break;
     case 1:
-      ftn_mtaxnb_cmplx8_(&ta, &tb, &mra, &ncb, &kab, alpha, a, &lda, b, &ldb,
+      ftn_mtaxnb_cmplx8_(&mra, &ncb, &kab, alpha, a, &lda, b, &ldb,
                            beta, c, &ldc);
       break;
     case 2:
-      ftn_mnaxtb_cmplx8_(&ta, &tb, &mra, &ncb, &kab, alpha, a, &lda, b, &ldb,
+      ftn_mnaxtb_cmplx8_(&mra, &ncb, &kab, alpha, a, &lda, b, &ldb,
                            beta, c, &ldc);
       break;
     case 3:
-      ftn_mtaxtb_cmplx8_(&ta, &tb, &mra, &ncb, &kab, alpha, a, &lda, b, &ldb,
+      ftn_mtaxtb_cmplx8_(&mra, &ncb, &kab, alpha, a, &lda, b, &ldb,
                            beta, c, &ldc);
     }
   }