From: Tobias Burnus <burnus@gcc.gnu.org>
Date: Thu, 6 Sep 2012 07:03:42 +0000 (+0200)
Subject: 2012-09-06  Tobias Burnus
X-Git-Tag: misc/gccgo-go1_1_2~1015
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3dcdfdc804568d313dd879a5fb6ea9beb115a27b;p=thirdparty%2Fgcc.git

2012-09-06  Tobias Burnus

        PR fortran/54463
        * trans-intrinsic.c (gfc_conv_intrinsic_funcall): Fix matmul
        call to BLAS if the default-kind has been promoted.

2012-09-06  Tobias Burnus

        PR fortran/54463
        * gfortran.dg/promotion_2.f90: New.

From-SVN: r191012
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 69c0fe8e5e67..9b616c2af3a6 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2012-09-06  Tobias Burnus
+
+	PR fortran/54463
+	* trans-intrinsic.c (gfc_conv_intrinsic_funcall): Fix matmul
+	call to BLAS if the default-kind has been promoted.
+
 2012-09-05  Tobias Burnus  <burnus@net-b.de>
 
 	PR fortran/54462
diff --git a/gcc/fortran/trans-intrinsic.c b/gcc/fortran/trans-intrinsic.c
index add4baaa3118..4b268b34ba7a 100644
--- a/gcc/fortran/trans-intrinsic.c
+++ b/gcc/fortran/trans-intrinsic.c
@@ -2362,21 +2362,20 @@ gfc_conv_intrinsic_funcall (gfc_se * se, gfc_expr * expr)
 
       if (gfc_option.flag_external_blas
 	  && (sym->ts.type == BT_REAL || sym->ts.type == BT_COMPLEX)
-	  && (sym->ts.kind == gfc_default_real_kind
-	      || sym->ts.kind == gfc_default_double_kind))
+	  && (sym->ts.kind == 4 || sym->ts.kind == 8))
 	{
 	  tree gemm_fndecl;
 
 	  if (sym->ts.type == BT_REAL)
 	    {
-	      if (sym->ts.kind == gfc_default_real_kind)
+	      if (sym->ts.kind == 4)
 		gemm_fndecl = gfor_fndecl_sgemm;
 	      else
 		gemm_fndecl = gfor_fndecl_dgemm;
 	    }
 	  else
 	    {
-	      if (sym->ts.kind == gfc_default_real_kind)
+	      if (sym->ts.kind == 4)
 		gemm_fndecl = gfor_fndecl_cgemm;
 	      else
 		gemm_fndecl = gfor_fndecl_zgemm;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c33fddce0970..7089b59b1efe 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-09-06  Tobias Burnus
+
+	PR fortran/54463
+	* gfortran.dg/promotion_2.f90: New.
+
 2012-09-05  Jakub Jelinek  <jakub@redhat.com>
 
 	PR middle-end/54486
diff --git a/gcc/testsuite/gfortran.dg/promotion_2.f90 b/gcc/testsuite/gfortran.dg/promotion_2.f90
new file mode 100644
index 000000000000..3acf249705c0
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/promotion_2.f90
@@ -0,0 +1,16 @@
+! { dg-do compile }
+! { dg-options "-fdefault-real-8 -fexternal-blas -fdump-tree-original" }
+!
+! PR fortran/54463
+!
+! Contributed by Simon Reinhardt
+!
+program test
+  implicit none
+  real, dimension(3,3) :: A
+  A = matmul(A,A)
+end program test
+
+! { dg-final { scan-tree-dump-times "sgemm_" 0 "original" } }
+! { dg-final { scan-tree-dump-times "dgemm_" 1 "original" } }
+! { dg-final { cleanup-tree-dump "original" } }