[gcc(refs/users/mikael/heads/refactor_descriptor_v08)] Régénération fichiers générés
Mikael Morin
mikael@gcc.gnu.org
Tue Sep 9 14:25:10 GMT 2025
https://gcc.gnu.org/g:37edaf2b1fff9f3bdedb9f3cc7e3df273d5f892a
commit 37edaf2b1fff9f3bdedb9f3cc7e3df273d5f892a
Author: Mikael Morin <mikael@gcc.gnu.org>
Date: Tue Sep 9 15:54:54 2025 +0200
Régénération fichiers générés
Diff:
---
libgfortran/generated/matmul_c10.c | 35 ++++++++++++++------------------
libgfortran/generated/matmul_c16.c | 35 ++++++++++++++------------------
libgfortran/generated/matmul_c17.c | 35 ++++++++++++++------------------
libgfortran/generated/matmul_c4.c | 35 ++++++++++++++------------------
libgfortran/generated/matmul_c8.c | 35 ++++++++++++++------------------
libgfortran/generated/matmul_i1.c | 35 ++++++++++++++------------------
libgfortran/generated/matmul_i16.c | 35 ++++++++++++++------------------
libgfortran/generated/matmul_i2.c | 35 ++++++++++++++------------------
libgfortran/generated/matmul_i4.c | 35 ++++++++++++++------------------
libgfortran/generated/matmul_i8.c | 35 ++++++++++++++------------------
libgfortran/generated/matmul_r10.c | 35 ++++++++++++++------------------
libgfortran/generated/matmul_r16.c | 35 ++++++++++++++------------------
libgfortran/generated/matmul_r17.c | 35 ++++++++++++++------------------
libgfortran/generated/matmul_r4.c | 35 ++++++++++++++------------------
libgfortran/generated/matmul_r8.c | 35 ++++++++++++++------------------
libgfortran/generated/matmulavx128_c10.c | 14 ++++++-------
libgfortran/generated/matmulavx128_c16.c | 14 ++++++-------
libgfortran/generated/matmulavx128_c17.c | 14 ++++++-------
libgfortran/generated/matmulavx128_c4.c | 14 ++++++-------
libgfortran/generated/matmulavx128_c8.c | 14 ++++++-------
libgfortran/generated/matmulavx128_i1.c | 14 ++++++-------
libgfortran/generated/matmulavx128_i16.c | 14 ++++++-------
libgfortran/generated/matmulavx128_i2.c | 14 ++++++-------
libgfortran/generated/matmulavx128_i4.c | 14 ++++++-------
libgfortran/generated/matmulavx128_i8.c | 14 ++++++-------
libgfortran/generated/matmulavx128_r10.c | 14 ++++++-------
libgfortran/generated/matmulavx128_r16.c | 14 ++++++-------
libgfortran/generated/matmulavx128_r17.c | 14 ++++++-------
libgfortran/generated/matmulavx128_r4.c | 14 ++++++-------
libgfortran/generated/matmulavx128_r8.c | 14 ++++++-------
30 files changed, 315 insertions(+), 420 deletions(-)
diff --git a/libgfortran/generated/matmul_c10.c b/libgfortran/generated/matmul_c10.c
index b3422e012b90..76f2ef2d442f 100644
--- a/libgfortran/generated/matmul_c10.c
+++ b/libgfortran/generated/matmul_c10.c
@@ -190,12 +190,12 @@ matmul_c10_avx (gfc_array_c10 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_COMPLEX_10);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -204,6 +204,7 @@ matmul_c10_avx (gfc_array_c10 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -232,6 +233,7 @@ matmul_c10_avx (gfc_array_c10 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -277,9 +279,6 @@ matmul_c10_avx (gfc_array_c10 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -760,12 +759,12 @@ matmul_c10_avx2 (gfc_array_c10 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_COMPLEX_10);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -774,6 +773,7 @@ matmul_c10_avx2 (gfc_array_c10 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -802,6 +802,7 @@ matmul_c10_avx2 (gfc_array_c10 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -847,9 +848,6 @@ matmul_c10_avx2 (gfc_array_c10 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -1330,12 +1328,12 @@ matmul_c10_avx512f (gfc_array_c10 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_COMPLEX_10);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1344,6 +1342,7 @@ matmul_c10_avx512f (gfc_array_c10 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1372,6 +1371,7 @@ matmul_c10_avx512f (gfc_array_c10 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -1417,9 +1417,6 @@ matmul_c10_avx512f (gfc_array_c10 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -1914,12 +1911,12 @@ matmul_c10_vanilla (gfc_array_c10 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_COMPLEX_10);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1928,6 +1925,7 @@ matmul_c10_vanilla (gfc_array_c10 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1956,6 +1954,7 @@ matmul_c10_vanilla (gfc_array_c10 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -2001,9 +2000,6 @@ matmul_c10_vanilla (gfc_array_c10 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -2557,12 +2553,12 @@ matmul_c10 (gfc_array_c10 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_COMPLEX_10);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -2571,6 +2567,7 @@ matmul_c10 (gfc_array_c10 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -2599,6 +2596,7 @@ matmul_c10 (gfc_array_c10 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -2644,9 +2642,6 @@ matmul_c10 (gfc_array_c10 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
diff --git a/libgfortran/generated/matmul_c16.c b/libgfortran/generated/matmul_c16.c
index 4afaf86b217e..ebaa27fb2623 100644
--- a/libgfortran/generated/matmul_c16.c
+++ b/libgfortran/generated/matmul_c16.c
@@ -190,12 +190,12 @@ matmul_c16_avx (gfc_array_c16 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_COMPLEX_16);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -204,6 +204,7 @@ matmul_c16_avx (gfc_array_c16 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -232,6 +233,7 @@ matmul_c16_avx (gfc_array_c16 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -277,9 +279,6 @@ matmul_c16_avx (gfc_array_c16 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -760,12 +759,12 @@ matmul_c16_avx2 (gfc_array_c16 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_COMPLEX_16);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -774,6 +773,7 @@ matmul_c16_avx2 (gfc_array_c16 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -802,6 +802,7 @@ matmul_c16_avx2 (gfc_array_c16 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -847,9 +848,6 @@ matmul_c16_avx2 (gfc_array_c16 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -1330,12 +1328,12 @@ matmul_c16_avx512f (gfc_array_c16 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_COMPLEX_16);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1344,6 +1342,7 @@ matmul_c16_avx512f (gfc_array_c16 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1372,6 +1371,7 @@ matmul_c16_avx512f (gfc_array_c16 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -1417,9 +1417,6 @@ matmul_c16_avx512f (gfc_array_c16 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -1914,12 +1911,12 @@ matmul_c16_vanilla (gfc_array_c16 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_COMPLEX_16);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1928,6 +1925,7 @@ matmul_c16_vanilla (gfc_array_c16 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1956,6 +1954,7 @@ matmul_c16_vanilla (gfc_array_c16 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -2001,9 +2000,6 @@ matmul_c16_vanilla (gfc_array_c16 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -2557,12 +2553,12 @@ matmul_c16 (gfc_array_c16 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_COMPLEX_16);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -2571,6 +2567,7 @@ matmul_c16 (gfc_array_c16 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -2599,6 +2596,7 @@ matmul_c16 (gfc_array_c16 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -2644,9 +2642,6 @@ matmul_c16 (gfc_array_c16 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
diff --git a/libgfortran/generated/matmul_c17.c b/libgfortran/generated/matmul_c17.c
index 260081ee5ed9..b13469d4ff1f 100644
--- a/libgfortran/generated/matmul_c17.c
+++ b/libgfortran/generated/matmul_c17.c
@@ -190,12 +190,12 @@ matmul_c17_avx (gfc_array_c17 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_COMPLEX_17);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -204,6 +204,7 @@ matmul_c17_avx (gfc_array_c17 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -232,6 +233,7 @@ matmul_c17_avx (gfc_array_c17 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -277,9 +279,6 @@ matmul_c17_avx (gfc_array_c17 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -760,12 +759,12 @@ matmul_c17_avx2 (gfc_array_c17 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_COMPLEX_17);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -774,6 +773,7 @@ matmul_c17_avx2 (gfc_array_c17 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -802,6 +802,7 @@ matmul_c17_avx2 (gfc_array_c17 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -847,9 +848,6 @@ matmul_c17_avx2 (gfc_array_c17 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -1330,12 +1328,12 @@ matmul_c17_avx512f (gfc_array_c17 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_COMPLEX_17);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1344,6 +1342,7 @@ matmul_c17_avx512f (gfc_array_c17 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1372,6 +1371,7 @@ matmul_c17_avx512f (gfc_array_c17 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -1417,9 +1417,6 @@ matmul_c17_avx512f (gfc_array_c17 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -1914,12 +1911,12 @@ matmul_c17_vanilla (gfc_array_c17 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_COMPLEX_17);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1928,6 +1925,7 @@ matmul_c17_vanilla (gfc_array_c17 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1956,6 +1954,7 @@ matmul_c17_vanilla (gfc_array_c17 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -2001,9 +2000,6 @@ matmul_c17_vanilla (gfc_array_c17 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -2557,12 +2553,12 @@ matmul_c17 (gfc_array_c17 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_COMPLEX_17);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -2571,6 +2567,7 @@ matmul_c17 (gfc_array_c17 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -2599,6 +2596,7 @@ matmul_c17 (gfc_array_c17 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -2644,9 +2642,6 @@ matmul_c17 (gfc_array_c17 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
diff --git a/libgfortran/generated/matmul_c4.c b/libgfortran/generated/matmul_c4.c
index 43dd6fb62715..34a13045848f 100644
--- a/libgfortran/generated/matmul_c4.c
+++ b/libgfortran/generated/matmul_c4.c
@@ -190,12 +190,12 @@ matmul_c4_avx (gfc_array_c4 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_COMPLEX_4);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -204,6 +204,7 @@ matmul_c4_avx (gfc_array_c4 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -232,6 +233,7 @@ matmul_c4_avx (gfc_array_c4 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -277,9 +279,6 @@ matmul_c4_avx (gfc_array_c4 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -760,12 +759,12 @@ matmul_c4_avx2 (gfc_array_c4 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_COMPLEX_4);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -774,6 +773,7 @@ matmul_c4_avx2 (gfc_array_c4 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -802,6 +802,7 @@ matmul_c4_avx2 (gfc_array_c4 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -847,9 +848,6 @@ matmul_c4_avx2 (gfc_array_c4 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -1330,12 +1328,12 @@ matmul_c4_avx512f (gfc_array_c4 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_COMPLEX_4);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1344,6 +1342,7 @@ matmul_c4_avx512f (gfc_array_c4 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1372,6 +1371,7 @@ matmul_c4_avx512f (gfc_array_c4 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -1417,9 +1417,6 @@ matmul_c4_avx512f (gfc_array_c4 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -1914,12 +1911,12 @@ matmul_c4_vanilla (gfc_array_c4 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_COMPLEX_4);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1928,6 +1925,7 @@ matmul_c4_vanilla (gfc_array_c4 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1956,6 +1954,7 @@ matmul_c4_vanilla (gfc_array_c4 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -2001,9 +2000,6 @@ matmul_c4_vanilla (gfc_array_c4 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -2557,12 +2553,12 @@ matmul_c4 (gfc_array_c4 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_COMPLEX_4);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -2571,6 +2567,7 @@ matmul_c4 (gfc_array_c4 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -2599,6 +2596,7 @@ matmul_c4 (gfc_array_c4 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -2644,9 +2642,6 @@ matmul_c4 (gfc_array_c4 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
diff --git a/libgfortran/generated/matmul_c8.c b/libgfortran/generated/matmul_c8.c
index 524394021470..9e27aabaa431 100644
--- a/libgfortran/generated/matmul_c8.c
+++ b/libgfortran/generated/matmul_c8.c
@@ -190,12 +190,12 @@ matmul_c8_avx (gfc_array_c8 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_COMPLEX_8);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -204,6 +204,7 @@ matmul_c8_avx (gfc_array_c8 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -232,6 +233,7 @@ matmul_c8_avx (gfc_array_c8 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -277,9 +279,6 @@ matmul_c8_avx (gfc_array_c8 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -760,12 +759,12 @@ matmul_c8_avx2 (gfc_array_c8 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_COMPLEX_8);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -774,6 +773,7 @@ matmul_c8_avx2 (gfc_array_c8 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -802,6 +802,7 @@ matmul_c8_avx2 (gfc_array_c8 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -847,9 +848,6 @@ matmul_c8_avx2 (gfc_array_c8 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -1330,12 +1328,12 @@ matmul_c8_avx512f (gfc_array_c8 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_COMPLEX_8);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1344,6 +1342,7 @@ matmul_c8_avx512f (gfc_array_c8 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1372,6 +1371,7 @@ matmul_c8_avx512f (gfc_array_c8 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -1417,9 +1417,6 @@ matmul_c8_avx512f (gfc_array_c8 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -1914,12 +1911,12 @@ matmul_c8_vanilla (gfc_array_c8 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_COMPLEX_8);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1928,6 +1925,7 @@ matmul_c8_vanilla (gfc_array_c8 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1956,6 +1954,7 @@ matmul_c8_vanilla (gfc_array_c8 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -2001,9 +2000,6 @@ matmul_c8_vanilla (gfc_array_c8 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -2557,12 +2553,12 @@ matmul_c8 (gfc_array_c8 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_COMPLEX_8);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -2571,6 +2567,7 @@ matmul_c8 (gfc_array_c8 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -2599,6 +2596,7 @@ matmul_c8 (gfc_array_c8 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -2644,9 +2642,6 @@ matmul_c8 (gfc_array_c8 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
diff --git a/libgfortran/generated/matmul_i1.c b/libgfortran/generated/matmul_i1.c
index e2e4b8c653a6..0340b21f3d73 100644
--- a/libgfortran/generated/matmul_i1.c
+++ b/libgfortran/generated/matmul_i1.c
@@ -190,12 +190,12 @@ matmul_i1_avx (gfc_array_m1 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_UINTEGER_1);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -204,6 +204,7 @@ matmul_i1_avx (gfc_array_m1 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -232,6 +233,7 @@ matmul_i1_avx (gfc_array_m1 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -277,9 +279,6 @@ matmul_i1_avx (gfc_array_m1 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -760,12 +759,12 @@ matmul_i1_avx2 (gfc_array_m1 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_UINTEGER_1);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -774,6 +773,7 @@ matmul_i1_avx2 (gfc_array_m1 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -802,6 +802,7 @@ matmul_i1_avx2 (gfc_array_m1 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -847,9 +848,6 @@ matmul_i1_avx2 (gfc_array_m1 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -1330,12 +1328,12 @@ matmul_i1_avx512f (gfc_array_m1 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_UINTEGER_1);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1344,6 +1342,7 @@ matmul_i1_avx512f (gfc_array_m1 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1372,6 +1371,7 @@ matmul_i1_avx512f (gfc_array_m1 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -1417,9 +1417,6 @@ matmul_i1_avx512f (gfc_array_m1 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -1914,12 +1911,12 @@ matmul_i1_vanilla (gfc_array_m1 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_UINTEGER_1);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1928,6 +1925,7 @@ matmul_i1_vanilla (gfc_array_m1 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1956,6 +1954,7 @@ matmul_i1_vanilla (gfc_array_m1 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -2001,9 +2000,6 @@ matmul_i1_vanilla (gfc_array_m1 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -2557,12 +2553,12 @@ matmul_i1 (gfc_array_m1 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_UINTEGER_1);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -2571,6 +2567,7 @@ matmul_i1 (gfc_array_m1 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -2599,6 +2596,7 @@ matmul_i1 (gfc_array_m1 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -2644,9 +2642,6 @@ matmul_i1 (gfc_array_m1 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
diff --git a/libgfortran/generated/matmul_i16.c b/libgfortran/generated/matmul_i16.c
index 25ae3e15b920..452d6d165303 100644
--- a/libgfortran/generated/matmul_i16.c
+++ b/libgfortran/generated/matmul_i16.c
@@ -190,12 +190,12 @@ matmul_i16_avx (gfc_array_m16 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_UINTEGER_16);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -204,6 +204,7 @@ matmul_i16_avx (gfc_array_m16 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -232,6 +233,7 @@ matmul_i16_avx (gfc_array_m16 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -277,9 +279,6 @@ matmul_i16_avx (gfc_array_m16 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -760,12 +759,12 @@ matmul_i16_avx2 (gfc_array_m16 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_UINTEGER_16);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -774,6 +773,7 @@ matmul_i16_avx2 (gfc_array_m16 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -802,6 +802,7 @@ matmul_i16_avx2 (gfc_array_m16 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -847,9 +848,6 @@ matmul_i16_avx2 (gfc_array_m16 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -1330,12 +1328,12 @@ matmul_i16_avx512f (gfc_array_m16 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_UINTEGER_16);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1344,6 +1342,7 @@ matmul_i16_avx512f (gfc_array_m16 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1372,6 +1371,7 @@ matmul_i16_avx512f (gfc_array_m16 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -1417,9 +1417,6 @@ matmul_i16_avx512f (gfc_array_m16 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -1914,12 +1911,12 @@ matmul_i16_vanilla (gfc_array_m16 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_UINTEGER_16);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1928,6 +1925,7 @@ matmul_i16_vanilla (gfc_array_m16 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1956,6 +1954,7 @@ matmul_i16_vanilla (gfc_array_m16 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -2001,9 +2000,6 @@ matmul_i16_vanilla (gfc_array_m16 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -2557,12 +2553,12 @@ matmul_i16 (gfc_array_m16 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_UINTEGER_16);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -2571,6 +2567,7 @@ matmul_i16 (gfc_array_m16 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -2599,6 +2596,7 @@ matmul_i16 (gfc_array_m16 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -2644,9 +2642,6 @@ matmul_i16 (gfc_array_m16 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
diff --git a/libgfortran/generated/matmul_i2.c b/libgfortran/generated/matmul_i2.c
index ca996eeaf09f..f83e91079813 100644
--- a/libgfortran/generated/matmul_i2.c
+++ b/libgfortran/generated/matmul_i2.c
@@ -190,12 +190,12 @@ matmul_i2_avx (gfc_array_m2 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_UINTEGER_2);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -204,6 +204,7 @@ matmul_i2_avx (gfc_array_m2 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -232,6 +233,7 @@ matmul_i2_avx (gfc_array_m2 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -277,9 +279,6 @@ matmul_i2_avx (gfc_array_m2 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -760,12 +759,12 @@ matmul_i2_avx2 (gfc_array_m2 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_UINTEGER_2);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -774,6 +773,7 @@ matmul_i2_avx2 (gfc_array_m2 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -802,6 +802,7 @@ matmul_i2_avx2 (gfc_array_m2 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -847,9 +848,6 @@ matmul_i2_avx2 (gfc_array_m2 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -1330,12 +1328,12 @@ matmul_i2_avx512f (gfc_array_m2 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_UINTEGER_2);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1344,6 +1342,7 @@ matmul_i2_avx512f (gfc_array_m2 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1372,6 +1371,7 @@ matmul_i2_avx512f (gfc_array_m2 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -1417,9 +1417,6 @@ matmul_i2_avx512f (gfc_array_m2 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -1914,12 +1911,12 @@ matmul_i2_vanilla (gfc_array_m2 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_UINTEGER_2);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1928,6 +1925,7 @@ matmul_i2_vanilla (gfc_array_m2 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1956,6 +1954,7 @@ matmul_i2_vanilla (gfc_array_m2 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -2001,9 +2000,6 @@ matmul_i2_vanilla (gfc_array_m2 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -2557,12 +2553,12 @@ matmul_i2 (gfc_array_m2 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_UINTEGER_2);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -2571,6 +2567,7 @@ matmul_i2 (gfc_array_m2 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -2599,6 +2596,7 @@ matmul_i2 (gfc_array_m2 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -2644,9 +2642,6 @@ matmul_i2 (gfc_array_m2 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
diff --git a/libgfortran/generated/matmul_i4.c b/libgfortran/generated/matmul_i4.c
index 068d01aca1d3..88fb93b7985d 100644
--- a/libgfortran/generated/matmul_i4.c
+++ b/libgfortran/generated/matmul_i4.c
@@ -190,12 +190,12 @@ matmul_i4_avx (gfc_array_m4 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_UINTEGER_4);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -204,6 +204,7 @@ matmul_i4_avx (gfc_array_m4 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -232,6 +233,7 @@ matmul_i4_avx (gfc_array_m4 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -277,9 +279,6 @@ matmul_i4_avx (gfc_array_m4 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -760,12 +759,12 @@ matmul_i4_avx2 (gfc_array_m4 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_UINTEGER_4);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -774,6 +773,7 @@ matmul_i4_avx2 (gfc_array_m4 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -802,6 +802,7 @@ matmul_i4_avx2 (gfc_array_m4 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -847,9 +848,6 @@ matmul_i4_avx2 (gfc_array_m4 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -1330,12 +1328,12 @@ matmul_i4_avx512f (gfc_array_m4 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_UINTEGER_4);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1344,6 +1342,7 @@ matmul_i4_avx512f (gfc_array_m4 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1372,6 +1371,7 @@ matmul_i4_avx512f (gfc_array_m4 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -1417,9 +1417,6 @@ matmul_i4_avx512f (gfc_array_m4 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -1914,12 +1911,12 @@ matmul_i4_vanilla (gfc_array_m4 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_UINTEGER_4);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1928,6 +1925,7 @@ matmul_i4_vanilla (gfc_array_m4 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1956,6 +1954,7 @@ matmul_i4_vanilla (gfc_array_m4 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -2001,9 +2000,6 @@ matmul_i4_vanilla (gfc_array_m4 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -2557,12 +2553,12 @@ matmul_i4 (gfc_array_m4 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_UINTEGER_4);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -2571,6 +2567,7 @@ matmul_i4 (gfc_array_m4 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -2599,6 +2596,7 @@ matmul_i4 (gfc_array_m4 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -2644,9 +2642,6 @@ matmul_i4 (gfc_array_m4 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
diff --git a/libgfortran/generated/matmul_i8.c b/libgfortran/generated/matmul_i8.c
index d4d7401b5ba9..96974cdaf1fe 100644
--- a/libgfortran/generated/matmul_i8.c
+++ b/libgfortran/generated/matmul_i8.c
@@ -190,12 +190,12 @@ matmul_i8_avx (gfc_array_m8 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_UINTEGER_8);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -204,6 +204,7 @@ matmul_i8_avx (gfc_array_m8 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -232,6 +233,7 @@ matmul_i8_avx (gfc_array_m8 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -277,9 +279,6 @@ matmul_i8_avx (gfc_array_m8 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -760,12 +759,12 @@ matmul_i8_avx2 (gfc_array_m8 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_UINTEGER_8);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -774,6 +773,7 @@ matmul_i8_avx2 (gfc_array_m8 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -802,6 +802,7 @@ matmul_i8_avx2 (gfc_array_m8 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -847,9 +848,6 @@ matmul_i8_avx2 (gfc_array_m8 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -1330,12 +1328,12 @@ matmul_i8_avx512f (gfc_array_m8 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_UINTEGER_8);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1344,6 +1342,7 @@ matmul_i8_avx512f (gfc_array_m8 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1372,6 +1371,7 @@ matmul_i8_avx512f (gfc_array_m8 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -1417,9 +1417,6 @@ matmul_i8_avx512f (gfc_array_m8 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -1914,12 +1911,12 @@ matmul_i8_vanilla (gfc_array_m8 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_UINTEGER_8);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1928,6 +1925,7 @@ matmul_i8_vanilla (gfc_array_m8 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1956,6 +1954,7 @@ matmul_i8_vanilla (gfc_array_m8 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -2001,9 +2000,6 @@ matmul_i8_vanilla (gfc_array_m8 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -2557,12 +2553,12 @@ matmul_i8 (gfc_array_m8 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_UINTEGER_8);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -2571,6 +2567,7 @@ matmul_i8 (gfc_array_m8 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -2599,6 +2596,7 @@ matmul_i8 (gfc_array_m8 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -2644,9 +2642,6 @@ matmul_i8 (gfc_array_m8 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
diff --git a/libgfortran/generated/matmul_r10.c b/libgfortran/generated/matmul_r10.c
index 27dd40af1176..dfa9452d59e8 100644
--- a/libgfortran/generated/matmul_r10.c
+++ b/libgfortran/generated/matmul_r10.c
@@ -190,12 +190,12 @@ matmul_r10_avx (gfc_array_r10 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_REAL_10);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -204,6 +204,7 @@ matmul_r10_avx (gfc_array_r10 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -232,6 +233,7 @@ matmul_r10_avx (gfc_array_r10 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -277,9 +279,6 @@ matmul_r10_avx (gfc_array_r10 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -760,12 +759,12 @@ matmul_r10_avx2 (gfc_array_r10 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_REAL_10);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -774,6 +773,7 @@ matmul_r10_avx2 (gfc_array_r10 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -802,6 +802,7 @@ matmul_r10_avx2 (gfc_array_r10 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -847,9 +848,6 @@ matmul_r10_avx2 (gfc_array_r10 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -1330,12 +1328,12 @@ matmul_r10_avx512f (gfc_array_r10 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_REAL_10);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1344,6 +1342,7 @@ matmul_r10_avx512f (gfc_array_r10 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1372,6 +1371,7 @@ matmul_r10_avx512f (gfc_array_r10 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -1417,9 +1417,6 @@ matmul_r10_avx512f (gfc_array_r10 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -1914,12 +1911,12 @@ matmul_r10_vanilla (gfc_array_r10 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_REAL_10);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1928,6 +1925,7 @@ matmul_r10_vanilla (gfc_array_r10 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1956,6 +1954,7 @@ matmul_r10_vanilla (gfc_array_r10 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -2001,9 +2000,6 @@ matmul_r10_vanilla (gfc_array_r10 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -2557,12 +2553,12 @@ matmul_r10 (gfc_array_r10 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_REAL_10);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -2571,6 +2567,7 @@ matmul_r10 (gfc_array_r10 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -2599,6 +2596,7 @@ matmul_r10 (gfc_array_r10 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -2644,9 +2642,6 @@ matmul_r10 (gfc_array_r10 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
diff --git a/libgfortran/generated/matmul_r16.c b/libgfortran/generated/matmul_r16.c
index 6e8b8d29e840..7b7992d5b70e 100644
--- a/libgfortran/generated/matmul_r16.c
+++ b/libgfortran/generated/matmul_r16.c
@@ -190,12 +190,12 @@ matmul_r16_avx (gfc_array_r16 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_REAL_16);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -204,6 +204,7 @@ matmul_r16_avx (gfc_array_r16 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -232,6 +233,7 @@ matmul_r16_avx (gfc_array_r16 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -277,9 +279,6 @@ matmul_r16_avx (gfc_array_r16 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -760,12 +759,12 @@ matmul_r16_avx2 (gfc_array_r16 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_REAL_16);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -774,6 +773,7 @@ matmul_r16_avx2 (gfc_array_r16 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -802,6 +802,7 @@ matmul_r16_avx2 (gfc_array_r16 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -847,9 +848,6 @@ matmul_r16_avx2 (gfc_array_r16 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -1330,12 +1328,12 @@ matmul_r16_avx512f (gfc_array_r16 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_REAL_16);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1344,6 +1342,7 @@ matmul_r16_avx512f (gfc_array_r16 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1372,6 +1371,7 @@ matmul_r16_avx512f (gfc_array_r16 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -1417,9 +1417,6 @@ matmul_r16_avx512f (gfc_array_r16 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -1914,12 +1911,12 @@ matmul_r16_vanilla (gfc_array_r16 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_REAL_16);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1928,6 +1925,7 @@ matmul_r16_vanilla (gfc_array_r16 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1956,6 +1954,7 @@ matmul_r16_vanilla (gfc_array_r16 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -2001,9 +2000,6 @@ matmul_r16_vanilla (gfc_array_r16 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -2557,12 +2553,12 @@ matmul_r16 (gfc_array_r16 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_REAL_16);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -2571,6 +2567,7 @@ matmul_r16 (gfc_array_r16 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -2599,6 +2596,7 @@ matmul_r16 (gfc_array_r16 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -2644,9 +2642,6 @@ matmul_r16 (gfc_array_r16 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
diff --git a/libgfortran/generated/matmul_r17.c b/libgfortran/generated/matmul_r17.c
index 59e8fb9af48c..5372c0d4965f 100644
--- a/libgfortran/generated/matmul_r17.c
+++ b/libgfortran/generated/matmul_r17.c
@@ -190,12 +190,12 @@ matmul_r17_avx (gfc_array_r17 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_REAL_17);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -204,6 +204,7 @@ matmul_r17_avx (gfc_array_r17 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -232,6 +233,7 @@ matmul_r17_avx (gfc_array_r17 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -277,9 +279,6 @@ matmul_r17_avx (gfc_array_r17 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -760,12 +759,12 @@ matmul_r17_avx2 (gfc_array_r17 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_REAL_17);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -774,6 +773,7 @@ matmul_r17_avx2 (gfc_array_r17 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -802,6 +802,7 @@ matmul_r17_avx2 (gfc_array_r17 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -847,9 +848,6 @@ matmul_r17_avx2 (gfc_array_r17 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -1330,12 +1328,12 @@ matmul_r17_avx512f (gfc_array_r17 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_REAL_17);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1344,6 +1342,7 @@ matmul_r17_avx512f (gfc_array_r17 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1372,6 +1371,7 @@ matmul_r17_avx512f (gfc_array_r17 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -1417,9 +1417,6 @@ matmul_r17_avx512f (gfc_array_r17 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -1914,12 +1911,12 @@ matmul_r17_vanilla (gfc_array_r17 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_REAL_17);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1928,6 +1925,7 @@ matmul_r17_vanilla (gfc_array_r17 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1956,6 +1954,7 @@ matmul_r17_vanilla (gfc_array_r17 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -2001,9 +2000,6 @@ matmul_r17_vanilla (gfc_array_r17 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -2557,12 +2553,12 @@ matmul_r17 (gfc_array_r17 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_REAL_17);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -2571,6 +2567,7 @@ matmul_r17 (gfc_array_r17 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -2599,6 +2596,7 @@ matmul_r17 (gfc_array_r17 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -2644,9 +2642,6 @@ matmul_r17 (gfc_array_r17 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
diff --git a/libgfortran/generated/matmul_r4.c b/libgfortran/generated/matmul_r4.c
index f0a3a43d8a81..2cef4e0138c2 100644
--- a/libgfortran/generated/matmul_r4.c
+++ b/libgfortran/generated/matmul_r4.c
@@ -190,12 +190,12 @@ matmul_r4_avx (gfc_array_r4 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_REAL_4);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -204,6 +204,7 @@ matmul_r4_avx (gfc_array_r4 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -232,6 +233,7 @@ matmul_r4_avx (gfc_array_r4 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -277,9 +279,6 @@ matmul_r4_avx (gfc_array_r4 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -760,12 +759,12 @@ matmul_r4_avx2 (gfc_array_r4 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_REAL_4);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -774,6 +773,7 @@ matmul_r4_avx2 (gfc_array_r4 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -802,6 +802,7 @@ matmul_r4_avx2 (gfc_array_r4 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -847,9 +848,6 @@ matmul_r4_avx2 (gfc_array_r4 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -1330,12 +1328,12 @@ matmul_r4_avx512f (gfc_array_r4 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_REAL_4);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1344,6 +1342,7 @@ matmul_r4_avx512f (gfc_array_r4 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1372,6 +1371,7 @@ matmul_r4_avx512f (gfc_array_r4 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -1417,9 +1417,6 @@ matmul_r4_avx512f (gfc_array_r4 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -1914,12 +1911,12 @@ matmul_r4_vanilla (gfc_array_r4 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_REAL_4);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1928,6 +1925,7 @@ matmul_r4_vanilla (gfc_array_r4 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1956,6 +1954,7 @@ matmul_r4_vanilla (gfc_array_r4 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -2001,9 +2000,6 @@ matmul_r4_vanilla (gfc_array_r4 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -2557,12 +2553,12 @@ matmul_r4 (gfc_array_r4 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_REAL_4);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -2571,6 +2567,7 @@ matmul_r4 (gfc_array_r4 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -2599,6 +2596,7 @@ matmul_r4 (gfc_array_r4 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -2644,9 +2642,6 @@ matmul_r4 (gfc_array_r4 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
diff --git a/libgfortran/generated/matmul_r8.c b/libgfortran/generated/matmul_r8.c
index fb1c8d9c8cc9..b06981e0b645 100644
--- a/libgfortran/generated/matmul_r8.c
+++ b/libgfortran/generated/matmul_r8.c
@@ -190,12 +190,12 @@ matmul_r8_avx (gfc_array_r8 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_REAL_8);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -204,6 +204,7 @@ matmul_r8_avx (gfc_array_r8 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -232,6 +233,7 @@ matmul_r8_avx (gfc_array_r8 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -277,9 +279,6 @@ matmul_r8_avx (gfc_array_r8 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -760,12 +759,12 @@ matmul_r8_avx2 (gfc_array_r8 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_REAL_8);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -774,6 +773,7 @@ matmul_r8_avx2 (gfc_array_r8 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -802,6 +802,7 @@ matmul_r8_avx2 (gfc_array_r8 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -847,9 +848,6 @@ matmul_r8_avx2 (gfc_array_r8 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -1330,12 +1328,12 @@ matmul_r8_avx512f (gfc_array_r8 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_REAL_8);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1344,6 +1342,7 @@ matmul_r8_avx512f (gfc_array_r8 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1372,6 +1371,7 @@ matmul_r8_avx512f (gfc_array_r8 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -1417,9 +1417,6 @@ matmul_r8_avx512f (gfc_array_r8 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -1914,12 +1911,12 @@ matmul_r8_vanilla (gfc_array_r8 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_REAL_8);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1928,6 +1925,7 @@ matmul_r8_vanilla (gfc_array_r8 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -1956,6 +1954,7 @@ matmul_r8_vanilla (gfc_array_r8 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -2001,9 +2000,6 @@ matmul_r8_vanilla (gfc_array_r8 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -2557,12 +2553,12 @@ matmul_r8 (gfc_array_r8 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_REAL_8);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -2571,6 +2567,7 @@ matmul_r8 (gfc_array_r8 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -2599,6 +2596,7 @@ matmul_r8 (gfc_array_r8 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -2644,9 +2642,6 @@ matmul_r8 (gfc_array_r8 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
diff --git a/libgfortran/generated/matmulavx128_c10.c b/libgfortran/generated/matmulavx128_c10.c
index ce0c6b4811f8..a54b40b6e26d 100644
--- a/libgfortran/generated/matmulavx128_c10.c
+++ b/libgfortran/generated/matmulavx128_c10.c
@@ -155,12 +155,12 @@ matmul_c10_avx128_fma3 (gfc_array_c10 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_COMPLEX_10);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -169,6 +169,7 @@ matmul_c10_avx128_fma3 (gfc_array_c10 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -197,6 +198,7 @@ matmul_c10_avx128_fma3 (gfc_array_c10 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -242,9 +244,6 @@ matmul_c10_avx128_fma3 (gfc_array_c10 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -726,12 +725,12 @@ matmul_c10_avx128_fma4 (gfc_array_c10 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_COMPLEX_10);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -740,6 +739,7 @@ matmul_c10_avx128_fma4 (gfc_array_c10 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -768,6 +768,7 @@ matmul_c10_avx128_fma4 (gfc_array_c10 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -813,9 +814,6 @@ matmul_c10_avx128_fma4 (gfc_array_c10 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
diff --git a/libgfortran/generated/matmulavx128_c16.c b/libgfortran/generated/matmulavx128_c16.c
index 545e510d6303..7dd2d6233014 100644
--- a/libgfortran/generated/matmulavx128_c16.c
+++ b/libgfortran/generated/matmulavx128_c16.c
@@ -155,12 +155,12 @@ matmul_c16_avx128_fma3 (gfc_array_c16 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_COMPLEX_16);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -169,6 +169,7 @@ matmul_c16_avx128_fma3 (gfc_array_c16 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -197,6 +198,7 @@ matmul_c16_avx128_fma3 (gfc_array_c16 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -242,9 +244,6 @@ matmul_c16_avx128_fma3 (gfc_array_c16 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -726,12 +725,12 @@ matmul_c16_avx128_fma4 (gfc_array_c16 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_COMPLEX_16);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -740,6 +739,7 @@ matmul_c16_avx128_fma4 (gfc_array_c16 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -768,6 +768,7 @@ matmul_c16_avx128_fma4 (gfc_array_c16 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -813,9 +814,6 @@ matmul_c16_avx128_fma4 (gfc_array_c16 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
diff --git a/libgfortran/generated/matmulavx128_c17.c b/libgfortran/generated/matmulavx128_c17.c
index c87791f25626..94edff10e3fb 100644
--- a/libgfortran/generated/matmulavx128_c17.c
+++ b/libgfortran/generated/matmulavx128_c17.c
@@ -155,12 +155,12 @@ matmul_c17_avx128_fma3 (gfc_array_c17 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_COMPLEX_17);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -169,6 +169,7 @@ matmul_c17_avx128_fma3 (gfc_array_c17 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -197,6 +198,7 @@ matmul_c17_avx128_fma3 (gfc_array_c17 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -242,9 +244,6 @@ matmul_c17_avx128_fma3 (gfc_array_c17 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -726,12 +725,12 @@ matmul_c17_avx128_fma4 (gfc_array_c17 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_COMPLEX_17);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -740,6 +739,7 @@ matmul_c17_avx128_fma4 (gfc_array_c17 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -768,6 +768,7 @@ matmul_c17_avx128_fma4 (gfc_array_c17 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -813,9 +814,6 @@ matmul_c17_avx128_fma4 (gfc_array_c17 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
diff --git a/libgfortran/generated/matmulavx128_c4.c b/libgfortran/generated/matmulavx128_c4.c
index 38024bf37dfe..a8ea0cf97a4b 100644
--- a/libgfortran/generated/matmulavx128_c4.c
+++ b/libgfortran/generated/matmulavx128_c4.c
@@ -155,12 +155,12 @@ matmul_c4_avx128_fma3 (gfc_array_c4 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_COMPLEX_4);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -169,6 +169,7 @@ matmul_c4_avx128_fma3 (gfc_array_c4 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -197,6 +198,7 @@ matmul_c4_avx128_fma3 (gfc_array_c4 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -242,9 +244,6 @@ matmul_c4_avx128_fma3 (gfc_array_c4 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -726,12 +725,12 @@ matmul_c4_avx128_fma4 (gfc_array_c4 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_COMPLEX_4);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -740,6 +739,7 @@ matmul_c4_avx128_fma4 (gfc_array_c4 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -768,6 +768,7 @@ matmul_c4_avx128_fma4 (gfc_array_c4 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -813,9 +814,6 @@ matmul_c4_avx128_fma4 (gfc_array_c4 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
diff --git a/libgfortran/generated/matmulavx128_c8.c b/libgfortran/generated/matmulavx128_c8.c
index c1507a3f0fa1..0ad53e6dc3b1 100644
--- a/libgfortran/generated/matmulavx128_c8.c
+++ b/libgfortran/generated/matmulavx128_c8.c
@@ -155,12 +155,12 @@ matmul_c8_avx128_fma3 (gfc_array_c8 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_COMPLEX_8);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -169,6 +169,7 @@ matmul_c8_avx128_fma3 (gfc_array_c8 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -197,6 +198,7 @@ matmul_c8_avx128_fma3 (gfc_array_c8 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -242,9 +244,6 @@ matmul_c8_avx128_fma3 (gfc_array_c8 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -726,12 +725,12 @@ matmul_c8_avx128_fma4 (gfc_array_c8 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_COMPLEX_8);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -740,6 +739,7 @@ matmul_c8_avx128_fma4 (gfc_array_c8 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -768,6 +768,7 @@ matmul_c8_avx128_fma4 (gfc_array_c8 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -813,9 +814,6 @@ matmul_c8_avx128_fma4 (gfc_array_c8 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
diff --git a/libgfortran/generated/matmulavx128_i1.c b/libgfortran/generated/matmulavx128_i1.c
index 5ce86852c7db..c17f3edfc5d1 100644
--- a/libgfortran/generated/matmulavx128_i1.c
+++ b/libgfortran/generated/matmulavx128_i1.c
@@ -155,12 +155,12 @@ matmul_i1_avx128_fma3 (gfc_array_i1 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_INTEGER_1);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -169,6 +169,7 @@ matmul_i1_avx128_fma3 (gfc_array_i1 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -197,6 +198,7 @@ matmul_i1_avx128_fma3 (gfc_array_i1 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -242,9 +244,6 @@ matmul_i1_avx128_fma3 (gfc_array_i1 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -726,12 +725,12 @@ matmul_i1_avx128_fma4 (gfc_array_i1 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_INTEGER_1);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -740,6 +739,7 @@ matmul_i1_avx128_fma4 (gfc_array_i1 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -768,6 +768,7 @@ matmul_i1_avx128_fma4 (gfc_array_i1 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -813,9 +814,6 @@ matmul_i1_avx128_fma4 (gfc_array_i1 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
diff --git a/libgfortran/generated/matmulavx128_i16.c b/libgfortran/generated/matmulavx128_i16.c
index b660916673fb..15f37fd1ce98 100644
--- a/libgfortran/generated/matmulavx128_i16.c
+++ b/libgfortran/generated/matmulavx128_i16.c
@@ -155,12 +155,12 @@ matmul_i16_avx128_fma3 (gfc_array_i16 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_INTEGER_16);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -169,6 +169,7 @@ matmul_i16_avx128_fma3 (gfc_array_i16 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -197,6 +198,7 @@ matmul_i16_avx128_fma3 (gfc_array_i16 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -242,9 +244,6 @@ matmul_i16_avx128_fma3 (gfc_array_i16 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -726,12 +725,12 @@ matmul_i16_avx128_fma4 (gfc_array_i16 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_INTEGER_16);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -740,6 +739,7 @@ matmul_i16_avx128_fma4 (gfc_array_i16 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -768,6 +768,7 @@ matmul_i16_avx128_fma4 (gfc_array_i16 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -813,9 +814,6 @@ matmul_i16_avx128_fma4 (gfc_array_i16 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
diff --git a/libgfortran/generated/matmulavx128_i2.c b/libgfortran/generated/matmulavx128_i2.c
index 1b8a4e2cc0cd..247eb3159738 100644
--- a/libgfortran/generated/matmulavx128_i2.c
+++ b/libgfortran/generated/matmulavx128_i2.c
@@ -155,12 +155,12 @@ matmul_i2_avx128_fma3 (gfc_array_i2 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_INTEGER_2);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -169,6 +169,7 @@ matmul_i2_avx128_fma3 (gfc_array_i2 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -197,6 +198,7 @@ matmul_i2_avx128_fma3 (gfc_array_i2 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -242,9 +244,6 @@ matmul_i2_avx128_fma3 (gfc_array_i2 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -726,12 +725,12 @@ matmul_i2_avx128_fma4 (gfc_array_i2 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_INTEGER_2);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -740,6 +739,7 @@ matmul_i2_avx128_fma4 (gfc_array_i2 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -768,6 +768,7 @@ matmul_i2_avx128_fma4 (gfc_array_i2 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -813,9 +814,6 @@ matmul_i2_avx128_fma4 (gfc_array_i2 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
diff --git a/libgfortran/generated/matmulavx128_i4.c b/libgfortran/generated/matmulavx128_i4.c
index 76640f2d06c8..aa6a5f50c5ac 100644
--- a/libgfortran/generated/matmulavx128_i4.c
+++ b/libgfortran/generated/matmulavx128_i4.c
@@ -155,12 +155,12 @@ matmul_i4_avx128_fma3 (gfc_array_i4 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_INTEGER_4);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -169,6 +169,7 @@ matmul_i4_avx128_fma3 (gfc_array_i4 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -197,6 +198,7 @@ matmul_i4_avx128_fma3 (gfc_array_i4 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -242,9 +244,6 @@ matmul_i4_avx128_fma3 (gfc_array_i4 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -726,12 +725,12 @@ matmul_i4_avx128_fma4 (gfc_array_i4 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_INTEGER_4);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -740,6 +739,7 @@ matmul_i4_avx128_fma4 (gfc_array_i4 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -768,6 +768,7 @@ matmul_i4_avx128_fma4 (gfc_array_i4 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -813,9 +814,6 @@ matmul_i4_avx128_fma4 (gfc_array_i4 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
diff --git a/libgfortran/generated/matmulavx128_i8.c b/libgfortran/generated/matmulavx128_i8.c
index 5a0fd7279dcb..fecf6252ef37 100644
--- a/libgfortran/generated/matmulavx128_i8.c
+++ b/libgfortran/generated/matmulavx128_i8.c
@@ -155,12 +155,12 @@ matmul_i8_avx128_fma3 (gfc_array_i8 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_INTEGER_8);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -169,6 +169,7 @@ matmul_i8_avx128_fma3 (gfc_array_i8 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -197,6 +198,7 @@ matmul_i8_avx128_fma3 (gfc_array_i8 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -242,9 +244,6 @@ matmul_i8_avx128_fma3 (gfc_array_i8 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -726,12 +725,12 @@ matmul_i8_avx128_fma4 (gfc_array_i8 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_INTEGER_8);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -740,6 +739,7 @@ matmul_i8_avx128_fma4 (gfc_array_i8 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -768,6 +768,7 @@ matmul_i8_avx128_fma4 (gfc_array_i8 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -813,9 +814,6 @@ matmul_i8_avx128_fma4 (gfc_array_i8 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
diff --git a/libgfortran/generated/matmulavx128_r10.c b/libgfortran/generated/matmulavx128_r10.c
index aabc81b5dd08..14e6ea1f5c43 100644
--- a/libgfortran/generated/matmulavx128_r10.c
+++ b/libgfortran/generated/matmulavx128_r10.c
@@ -155,12 +155,12 @@ matmul_r10_avx128_fma3 (gfc_array_r10 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_REAL_10);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -169,6 +169,7 @@ matmul_r10_avx128_fma3 (gfc_array_r10 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -197,6 +198,7 @@ matmul_r10_avx128_fma3 (gfc_array_r10 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -242,9 +244,6 @@ matmul_r10_avx128_fma3 (gfc_array_r10 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -726,12 +725,12 @@ matmul_r10_avx128_fma4 (gfc_array_r10 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_REAL_10);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -740,6 +739,7 @@ matmul_r10_avx128_fma4 (gfc_array_r10 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -768,6 +768,7 @@ matmul_r10_avx128_fma4 (gfc_array_r10 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -813,9 +814,6 @@ matmul_r10_avx128_fma4 (gfc_array_r10 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
diff --git a/libgfortran/generated/matmulavx128_r16.c b/libgfortran/generated/matmulavx128_r16.c
index 97ea198db564..62917949db7e 100644
--- a/libgfortran/generated/matmulavx128_r16.c
+++ b/libgfortran/generated/matmulavx128_r16.c
@@ -155,12 +155,12 @@ matmul_r16_avx128_fma3 (gfc_array_r16 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_REAL_16);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -169,6 +169,7 @@ matmul_r16_avx128_fma3 (gfc_array_r16 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -197,6 +198,7 @@ matmul_r16_avx128_fma3 (gfc_array_r16 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -242,9 +244,6 @@ matmul_r16_avx128_fma3 (gfc_array_r16 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -726,12 +725,12 @@ matmul_r16_avx128_fma4 (gfc_array_r16 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_REAL_16);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -740,6 +739,7 @@ matmul_r16_avx128_fma4 (gfc_array_r16 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -768,6 +768,7 @@ matmul_r16_avx128_fma4 (gfc_array_r16 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -813,9 +814,6 @@ matmul_r16_avx128_fma4 (gfc_array_r16 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
diff --git a/libgfortran/generated/matmulavx128_r17.c b/libgfortran/generated/matmulavx128_r17.c
index 11beaff509ad..e67518275825 100644
--- a/libgfortran/generated/matmulavx128_r17.c
+++ b/libgfortran/generated/matmulavx128_r17.c
@@ -155,12 +155,12 @@ matmul_r17_avx128_fma3 (gfc_array_r17 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_REAL_17);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -169,6 +169,7 @@ matmul_r17_avx128_fma3 (gfc_array_r17 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -197,6 +198,7 @@ matmul_r17_avx128_fma3 (gfc_array_r17 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -242,9 +244,6 @@ matmul_r17_avx128_fma3 (gfc_array_r17 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -726,12 +725,12 @@ matmul_r17_avx128_fma4 (gfc_array_r17 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_REAL_17);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -740,6 +739,7 @@ matmul_r17_avx128_fma4 (gfc_array_r17 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -768,6 +768,7 @@ matmul_r17_avx128_fma4 (gfc_array_r17 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -813,9 +814,6 @@ matmul_r17_avx128_fma4 (gfc_array_r17 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
diff --git a/libgfortran/generated/matmulavx128_r4.c b/libgfortran/generated/matmulavx128_r4.c
index 4508ce066493..c771b8f1355c 100644
--- a/libgfortran/generated/matmulavx128_r4.c
+++ b/libgfortran/generated/matmulavx128_r4.c
@@ -155,12 +155,12 @@ matmul_r4_avx128_fma3 (gfc_array_r4 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_REAL_4);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -169,6 +169,7 @@ matmul_r4_avx128_fma3 (gfc_array_r4 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -197,6 +198,7 @@ matmul_r4_avx128_fma3 (gfc_array_r4 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -242,9 +244,6 @@ matmul_r4_avx128_fma3 (gfc_array_r4 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -726,12 +725,12 @@ matmul_r4_avx128_fma4 (gfc_array_r4 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_REAL_4);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -740,6 +739,7 @@ matmul_r4_avx128_fma4 (gfc_array_r4 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -768,6 +768,7 @@ matmul_r4_avx128_fma4 (gfc_array_r4 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -813,9 +814,6 @@ matmul_r4_avx128_fma4 (gfc_array_r4 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
diff --git a/libgfortran/generated/matmulavx128_r8.c b/libgfortran/generated/matmulavx128_r8.c
index c0e728ef5537..6f7a12c37bb6 100644
--- a/libgfortran/generated/matmulavx128_r8.c
+++ b/libgfortran/generated/matmulavx128_r8.c
@@ -155,12 +155,12 @@ matmul_r8_avx128_fma3 (gfc_array_r8 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_REAL_8);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -169,6 +169,7 @@ matmul_r8_avx128_fma3 (gfc_array_r8 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -197,6 +198,7 @@ matmul_r8_avx128_fma3 (gfc_array_r8 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -242,9 +244,6 @@ matmul_r8_avx128_fma3 (gfc_array_r8 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
@@ -726,12 +725,12 @@ matmul_r8_avx128_fma4 (gfc_array_r8 * const restrict retarray,
rystride = GFC_DESCRIPTOR_STRIDE(retarray,1);
}
-
if (GFC_DESCRIPTOR_RANK (a) == 1)
{
/* Treat it as a a row matrix A[1,count]. */
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = 1;
+ aystride_bytes = sizeof (GFC_REAL_8);
xcount = 1;
count = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -740,6 +739,7 @@ matmul_r8_avx128_fma4 (gfc_array_r8 * const restrict retarray,
{
axstride = GFC_DESCRIPTOR_STRIDE(a,0);
aystride = GFC_DESCRIPTOR_STRIDE(a,1);
+ aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
count = GFC_DESCRIPTOR_EXTENT(a,1);
xcount = GFC_DESCRIPTOR_EXTENT(a,0);
@@ -768,6 +768,7 @@ matmul_r8_avx128_fma4 (gfc_array_r8 * const restrict retarray,
{
bxstride = GFC_DESCRIPTOR_STRIDE(b,0);
bystride = GFC_DESCRIPTOR_STRIDE(b,1);
+ bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
ycount = GFC_DESCRIPTOR_EXTENT(b,1);
}
@@ -813,9 +814,6 @@ matmul_r8_avx128_fma4 (gfc_array_r8 * const restrict retarray,
}
}
- aystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(a,1);
- bystride_bytes = GFC_DESCRIPTOR_STRIDE_BYTES(b,1);
-
if (rxstride == 1 && axstride == 1 && bxstride == 1
&& GFC_DESCRIPTOR_RANK (b) != 1)
{
More information about the Gcc-cvs
mailing list