From patchwork Tue May 9 17:35:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Koenig X-Patchwork-Id: 760259 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wMmk71GHbz9s3T for ; Wed, 10 May 2017 03:35:58 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="a9ieY0mr"; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to :from:subject:message-id:date:mime-version:content-type; q=dns; s=default; b=wYipUtIQteCxE/TDJNL3QtOL4DoQAeLdSIOYI+6MLzxXMGLSt0 zBcJGrLbvavyGmcX4IlIAZmHi0sNLPRzREDCDZwH1kHtN/iYc7l91ySaMM0DoKpk rZOUS6PFB/4CiBSxYpNKfS/lDVdnaEZ2VjDrHKX5dg2GVq/enyA0regLY= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to :from:subject:message-id:date:mime-version:content-type; s= default; bh=w3/fiEIqtIIK0ju8Gfju0CWy71U=; b=a9ieY0mrtDcMKUJ3idei BYOAYkNklJ3VyuvVrPaUvsCfnbfiF0QQZ/8l9rOg6JLLmT90wS95YuAIUoGUxWo2 OJxO2m6WysIYvwOagBOYlnj430RB0gPiyD9lx38GqnOqh5j5puHFk6ovtWEzEI2K JBefiA+3RsmiRRjUu16JZQo= Received: (qmail 73343 invoked by alias); 9 May 2017 17:35:29 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 73306 invoked by uid 89); 9 May 2017 17:35:26 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-10.8 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_2, GIT_PATCH_3, KAM_ASCII_DIVIDERS, RCVD_IN_DNSWL_LOW, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 spammy=4523 X-Spam-User: qpsmtpd, 3 recipients X-HELO: cc-smtpout3.netcologne.de Received: from cc-smtpout3.netcologne.de (HELO cc-smtpout3.netcologne.de) (89.1.8.213) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 09 May 2017 17:35:16 +0000 Received: from cc-smtpin1.netcologne.de (cc-smtpin1.netcologne.de [89.1.8.201]) by cc-smtpout3.netcologne.de (Postfix) with ESMTP id A35D1127B6; Tue, 9 May 2017 19:35:16 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by cc-smtpin1.netcologne.de (Postfix) with ESMTP id 93A6511E27; Tue, 9 May 2017 19:35:16 +0200 (CEST) Received: from [78.35.160.112] (helo=cc-smtpin1.netcologne.de) by localhost with ESMTP (eXpurgate 4.1.9) (envelope-from ) id 5911fdd4-021e-7f0000012729-7f000001989e-1 for ; Tue, 09 May 2017 19:35:16 +0200 Received: from [192.168.178.20] (xdsl-78-35-160-112.netcologne.de [78.35.160.112]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by cc-smtpin1.netcologne.de (Postfix) with ESMTPSA; Tue, 9 May 2017 19:35:13 +0200 (CEST) To: "fortran@gcc.gnu.org" , gcc-patches , tschwinge@gcc.gnu.org From: Thomas Koenig Subject: [patch, libfortran] Fix PR 80687l build failure on nvptx Message-ID: Date: Tue, 9 May 2017 19:35:13 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.1.0 MIME-Version: 1.0 Hello world, the attached patch hopefully fixes the build failure on nvptx introduced by my recent matmul library patch. It uses malloc/free if VLAs do not work. Thomas S., does this fix the problem? Tested on x86_64 to make sure that the matmul tests still pass; full regression test still in progress. OK for trunk if the nvptx problem is fixed and regression-tests pass? Regards Thomas 2017-05-09 Thomas Koenig PR fortran/80687 * acinclude.m4 (LIBGFOR_CHECK_VLA): New macro. * configure.ac: Use it. * config.h.in: Regenerated. * configure: Regenerated. * m4/matmul_internal.m4: 'matmul_name`: Use malloc/free instead of VLA if HAVE_VLA is undefined. t1 to a VLA of the required size. * generated/matmul_c10.c: Regenerated. * generated/matmul_c16.c: Regenerated. * generated/matmul_c4.c: Regenerated. * generated/matmul_c8.c: Regenerated. * generated/matmul_i1.c: Regenerated. * generated/matmul_i16.c: Regenerated. * generated/matmul_i2.c: Regenerated. * generated/matmul_i4.c: Regenerated. * generated/matmul_i8.c: Regenerated. * generated/matmul_r10.c: Regenerated. * generated/matmul_r16.c: Regenerated. * generated/matmul_r4.c: Regenerated. * generated/matmul_r8.c: Regenerated. Index: acinclude.m4 =================================================================== --- acinclude.m4 (Revision 247566) +++ acinclude.m4 (Arbeitskopie) @@ -452,3 +452,20 @@ AC_DEFUN([LIBGFOR_CHECK_AVX512F], [ []) CFLAGS="$ac_save_CFLAGS" ]) + +dnl Check if VLAs work + +AC_DEFUN([LIBGFOR_CHECK_VLA], [ + ac_save_CFLAGS="$CFLAGS" + CFLAGS="-Wno-vla" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + void foo(int n) + { + int a[n]; + }]], [[]])], + AC_DEFINE(HAVE_VLA, 1, + [Define if VLAs can be compiled]), + []) + CFLAGS="$ac_save_CFLAGS" +]) + Index: config.h.in =================================================================== --- config.h.in (Revision 247566) +++ config.h.in (Arbeitskopie) @@ -807,6 +807,9 @@ /* Define to 1 if you have the `uselocale' function. */ #undef HAVE_USELOCALE +/* Define if VLAs can be compiled */ +#undef HAVE_VLA + /* Define to 1 if you have the `vsnprintf' function. */ #undef HAVE_VSNPRINTF Index: configure =================================================================== --- configure (Revision 247566) +++ configure (Arbeitskopie) @@ -26363,6 +26363,34 @@ rm -f core conftest.err conftest.$ac_objext confte CFLAGS="$ac_save_CFLAGS" +# Check wether VLAs work + + ac_save_CFLAGS="$CFLAGS" + CFLAGS="-Wno-vla" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + void foo(int n) + { + int a[n]; + } +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + +$as_echo "#define HAVE_VLA 1" >>confdefs.h + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS="$ac_save_CFLAGS" + + # Determine what GCC version number to use in filesystem paths. get_gcc_base_ver="cat" Index: configure.ac =================================================================== --- configure.ac (Revision 247566) +++ configure.ac (Arbeitskopie) @@ -624,6 +624,9 @@ LIBGFOR_CHECK_AVX2 # Check wether we support AVX512f extensions LIBGFOR_CHECK_AVX512F +# Check wether VLAs work +LIBGFOR_CHECK_VLA + # Determine what GCC version number to use in filesystem paths. GCC_BASE_VER Index: generated/matmul_c10.c =================================================================== --- generated/matmul_c10.c (Revision 247753) +++ generated/matmul_c10.c (Arbeitskopie) @@ -316,11 +316,15 @@ matmul_c10_avx (gfc_array_c10 * const restrict ret if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_COMPLEX_10 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_COMPLEX_10 *t1; + t1 = malloc (t1_dim * sizeof(GFC_COMPLEX_10)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -535,6 +539,9 @@ matmul_c10_avx (gfc_array_c10 * const restrict ret } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) @@ -869,11 +876,15 @@ matmul_c10_avx2 (gfc_array_c10 * const restrict re if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_COMPLEX_10 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_COMPLEX_10 *t1; + t1 = malloc (t1_dim * sizeof(GFC_COMPLEX_10)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -1088,6 +1099,9 @@ matmul_c10_avx2 (gfc_array_c10 * const restrict re } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) @@ -1422,11 +1436,15 @@ matmul_c10_avx512f (gfc_array_c10 * const restrict if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_COMPLEX_10 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_COMPLEX_10 *t1; + t1 = malloc (t1_dim * sizeof(GFC_COMPLEX_10)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -1641,6 +1659,9 @@ matmul_c10_avx512f (gfc_array_c10 * const restrict } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) @@ -1971,11 +1992,15 @@ matmul_c10_vanilla (gfc_array_c10 * const restrict if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_COMPLEX_10 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_COMPLEX_10 *t1; + t1 = malloc (t1_dim * sizeof(GFC_COMPLEX_10)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -2190,6 +2215,9 @@ matmul_c10_vanilla (gfc_array_c10 * const restrict } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) @@ -2578,11 +2606,15 @@ matmul_c10 (gfc_array_c10 * const restrict retarra if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_COMPLEX_10 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_COMPLEX_10 *t1; + t1 = malloc (t1_dim * sizeof(GFC_COMPLEX_10)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -2797,6 +2829,9 @@ matmul_c10 (gfc_array_c10 * const restrict retarra } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) Index: generated/matmul_c16.c =================================================================== --- generated/matmul_c16.c (Revision 247753) +++ generated/matmul_c16.c (Arbeitskopie) @@ -316,11 +316,15 @@ matmul_c16_avx (gfc_array_c16 * const restrict ret if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_COMPLEX_16 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_COMPLEX_16 *t1; + t1 = malloc (t1_dim * sizeof(GFC_COMPLEX_16)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -535,6 +539,9 @@ matmul_c16_avx (gfc_array_c16 * const restrict ret } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) @@ -869,11 +876,15 @@ matmul_c16_avx2 (gfc_array_c16 * const restrict re if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_COMPLEX_16 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_COMPLEX_16 *t1; + t1 = malloc (t1_dim * sizeof(GFC_COMPLEX_16)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -1088,6 +1099,9 @@ matmul_c16_avx2 (gfc_array_c16 * const restrict re } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) @@ -1422,11 +1436,15 @@ matmul_c16_avx512f (gfc_array_c16 * const restrict if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_COMPLEX_16 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_COMPLEX_16 *t1; + t1 = malloc (t1_dim * sizeof(GFC_COMPLEX_16)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -1641,6 +1659,9 @@ matmul_c16_avx512f (gfc_array_c16 * const restrict } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) @@ -1971,11 +1992,15 @@ matmul_c16_vanilla (gfc_array_c16 * const restrict if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_COMPLEX_16 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_COMPLEX_16 *t1; + t1 = malloc (t1_dim * sizeof(GFC_COMPLEX_16)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -2190,6 +2215,9 @@ matmul_c16_vanilla (gfc_array_c16 * const restrict } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) @@ -2578,11 +2606,15 @@ matmul_c16 (gfc_array_c16 * const restrict retarra if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_COMPLEX_16 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_COMPLEX_16 *t1; + t1 = malloc (t1_dim * sizeof(GFC_COMPLEX_16)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -2797,6 +2829,9 @@ matmul_c16 (gfc_array_c16 * const restrict retarra } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) Index: generated/matmul_c4.c =================================================================== --- generated/matmul_c4.c (Revision 247753) +++ generated/matmul_c4.c (Arbeitskopie) @@ -316,11 +316,15 @@ matmul_c4_avx (gfc_array_c4 * const restrict retar if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_COMPLEX_4 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_COMPLEX_4 *t1; + t1 = malloc (t1_dim * sizeof(GFC_COMPLEX_4)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -535,6 +539,9 @@ matmul_c4_avx (gfc_array_c4 * const restrict retar } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) @@ -869,11 +876,15 @@ matmul_c4_avx2 (gfc_array_c4 * const restrict reta if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_COMPLEX_4 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_COMPLEX_4 *t1; + t1 = malloc (t1_dim * sizeof(GFC_COMPLEX_4)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -1088,6 +1099,9 @@ matmul_c4_avx2 (gfc_array_c4 * const restrict reta } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) @@ -1422,11 +1436,15 @@ matmul_c4_avx512f (gfc_array_c4 * const restrict r if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_COMPLEX_4 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_COMPLEX_4 *t1; + t1 = malloc (t1_dim * sizeof(GFC_COMPLEX_4)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -1641,6 +1659,9 @@ matmul_c4_avx512f (gfc_array_c4 * const restrict r } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) @@ -1971,11 +1992,15 @@ matmul_c4_vanilla (gfc_array_c4 * const restrict r if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_COMPLEX_4 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_COMPLEX_4 *t1; + t1 = malloc (t1_dim * sizeof(GFC_COMPLEX_4)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -2190,6 +2215,9 @@ matmul_c4_vanilla (gfc_array_c4 * const restrict r } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) @@ -2578,11 +2606,15 @@ matmul_c4 (gfc_array_c4 * const restrict retarray, if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_COMPLEX_4 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_COMPLEX_4 *t1; + t1 = malloc (t1_dim * sizeof(GFC_COMPLEX_4)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -2797,6 +2829,9 @@ matmul_c4 (gfc_array_c4 * const restrict retarray, } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) Index: generated/matmul_c8.c =================================================================== --- generated/matmul_c8.c (Revision 247753) +++ generated/matmul_c8.c (Arbeitskopie) @@ -316,11 +316,15 @@ matmul_c8_avx (gfc_array_c8 * const restrict retar if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_COMPLEX_8 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_COMPLEX_8 *t1; + t1 = malloc (t1_dim * sizeof(GFC_COMPLEX_8)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -535,6 +539,9 @@ matmul_c8_avx (gfc_array_c8 * const restrict retar } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) @@ -869,11 +876,15 @@ matmul_c8_avx2 (gfc_array_c8 * const restrict reta if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_COMPLEX_8 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_COMPLEX_8 *t1; + t1 = malloc (t1_dim * sizeof(GFC_COMPLEX_8)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -1088,6 +1099,9 @@ matmul_c8_avx2 (gfc_array_c8 * const restrict reta } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) @@ -1422,11 +1436,15 @@ matmul_c8_avx512f (gfc_array_c8 * const restrict r if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_COMPLEX_8 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_COMPLEX_8 *t1; + t1 = malloc (t1_dim * sizeof(GFC_COMPLEX_8)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -1641,6 +1659,9 @@ matmul_c8_avx512f (gfc_array_c8 * const restrict r } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) @@ -1971,11 +1992,15 @@ matmul_c8_vanilla (gfc_array_c8 * const restrict r if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_COMPLEX_8 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_COMPLEX_8 *t1; + t1 = malloc (t1_dim * sizeof(GFC_COMPLEX_8)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -2190,6 +2215,9 @@ matmul_c8_vanilla (gfc_array_c8 * const restrict r } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) @@ -2578,11 +2606,15 @@ matmul_c8 (gfc_array_c8 * const restrict retarray, if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_COMPLEX_8 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_COMPLEX_8 *t1; + t1 = malloc (t1_dim * sizeof(GFC_COMPLEX_8)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -2797,6 +2829,9 @@ matmul_c8 (gfc_array_c8 * const restrict retarray, } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) Index: generated/matmul_i1.c =================================================================== --- generated/matmul_i1.c (Revision 247753) +++ generated/matmul_i1.c (Arbeitskopie) @@ -316,11 +316,15 @@ matmul_i1_avx (gfc_array_i1 * const restrict retar if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_INTEGER_1 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_INTEGER_1 *t1; + t1 = malloc (t1_dim * sizeof(GFC_INTEGER_1)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -535,6 +539,9 @@ matmul_i1_avx (gfc_array_i1 * const restrict retar } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) @@ -869,11 +876,15 @@ matmul_i1_avx2 (gfc_array_i1 * const restrict reta if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_INTEGER_1 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_INTEGER_1 *t1; + t1 = malloc (t1_dim * sizeof(GFC_INTEGER_1)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -1088,6 +1099,9 @@ matmul_i1_avx2 (gfc_array_i1 * const restrict reta } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) @@ -1422,11 +1436,15 @@ matmul_i1_avx512f (gfc_array_i1 * const restrict r if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_INTEGER_1 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_INTEGER_1 *t1; + t1 = malloc (t1_dim * sizeof(GFC_INTEGER_1)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -1641,6 +1659,9 @@ matmul_i1_avx512f (gfc_array_i1 * const restrict r } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) @@ -1971,11 +1992,15 @@ matmul_i1_vanilla (gfc_array_i1 * const restrict r if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_INTEGER_1 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_INTEGER_1 *t1; + t1 = malloc (t1_dim * sizeof(GFC_INTEGER_1)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -2190,6 +2215,9 @@ matmul_i1_vanilla (gfc_array_i1 * const restrict r } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) @@ -2578,11 +2606,15 @@ matmul_i1 (gfc_array_i1 * const restrict retarray, if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_INTEGER_1 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_INTEGER_1 *t1; + t1 = malloc (t1_dim * sizeof(GFC_INTEGER_1)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -2797,6 +2829,9 @@ matmul_i1 (gfc_array_i1 * const restrict retarray, } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) Index: generated/matmul_i16.c =================================================================== --- generated/matmul_i16.c (Revision 247753) +++ generated/matmul_i16.c (Arbeitskopie) @@ -316,11 +316,15 @@ matmul_i16_avx (gfc_array_i16 * const restrict ret if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_INTEGER_16 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_INTEGER_16 *t1; + t1 = malloc (t1_dim * sizeof(GFC_INTEGER_16)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -535,6 +539,9 @@ matmul_i16_avx (gfc_array_i16 * const restrict ret } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) @@ -869,11 +876,15 @@ matmul_i16_avx2 (gfc_array_i16 * const restrict re if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_INTEGER_16 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_INTEGER_16 *t1; + t1 = malloc (t1_dim * sizeof(GFC_INTEGER_16)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -1088,6 +1099,9 @@ matmul_i16_avx2 (gfc_array_i16 * const restrict re } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) @@ -1422,11 +1436,15 @@ matmul_i16_avx512f (gfc_array_i16 * const restrict if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_INTEGER_16 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_INTEGER_16 *t1; + t1 = malloc (t1_dim * sizeof(GFC_INTEGER_16)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -1641,6 +1659,9 @@ matmul_i16_avx512f (gfc_array_i16 * const restrict } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) @@ -1971,11 +1992,15 @@ matmul_i16_vanilla (gfc_array_i16 * const restrict if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_INTEGER_16 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_INTEGER_16 *t1; + t1 = malloc (t1_dim * sizeof(GFC_INTEGER_16)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -2190,6 +2215,9 @@ matmul_i16_vanilla (gfc_array_i16 * const restrict } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) @@ -2578,11 +2606,15 @@ matmul_i16 (gfc_array_i16 * const restrict retarra if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_INTEGER_16 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_INTEGER_16 *t1; + t1 = malloc (t1_dim * sizeof(GFC_INTEGER_16)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -2797,6 +2829,9 @@ matmul_i16 (gfc_array_i16 * const restrict retarra } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) Index: generated/matmul_i2.c =================================================================== --- generated/matmul_i2.c (Revision 247753) +++ generated/matmul_i2.c (Arbeitskopie) @@ -316,11 +316,15 @@ matmul_i2_avx (gfc_array_i2 * const restrict retar if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_INTEGER_2 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_INTEGER_2 *t1; + t1 = malloc (t1_dim * sizeof(GFC_INTEGER_2)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -535,6 +539,9 @@ matmul_i2_avx (gfc_array_i2 * const restrict retar } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) @@ -869,11 +876,15 @@ matmul_i2_avx2 (gfc_array_i2 * const restrict reta if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_INTEGER_2 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_INTEGER_2 *t1; + t1 = malloc (t1_dim * sizeof(GFC_INTEGER_2)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -1088,6 +1099,9 @@ matmul_i2_avx2 (gfc_array_i2 * const restrict reta } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) @@ -1422,11 +1436,15 @@ matmul_i2_avx512f (gfc_array_i2 * const restrict r if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_INTEGER_2 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_INTEGER_2 *t1; + t1 = malloc (t1_dim * sizeof(GFC_INTEGER_2)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -1641,6 +1659,9 @@ matmul_i2_avx512f (gfc_array_i2 * const restrict r } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) @@ -1971,11 +1992,15 @@ matmul_i2_vanilla (gfc_array_i2 * const restrict r if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_INTEGER_2 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_INTEGER_2 *t1; + t1 = malloc (t1_dim * sizeof(GFC_INTEGER_2)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -2190,6 +2215,9 @@ matmul_i2_vanilla (gfc_array_i2 * const restrict r } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) @@ -2578,11 +2606,15 @@ matmul_i2 (gfc_array_i2 * const restrict retarray, if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_INTEGER_2 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_INTEGER_2 *t1; + t1 = malloc (t1_dim * sizeof(GFC_INTEGER_2)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -2797,6 +2829,9 @@ matmul_i2 (gfc_array_i2 * const restrict retarray, } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) Index: generated/matmul_i4.c =================================================================== --- generated/matmul_i4.c (Revision 247753) +++ generated/matmul_i4.c (Arbeitskopie) @@ -316,11 +316,15 @@ matmul_i4_avx (gfc_array_i4 * const restrict retar if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_INTEGER_4 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_INTEGER_4 *t1; + t1 = malloc (t1_dim * sizeof(GFC_INTEGER_4)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -535,6 +539,9 @@ matmul_i4_avx (gfc_array_i4 * const restrict retar } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) @@ -869,11 +876,15 @@ matmul_i4_avx2 (gfc_array_i4 * const restrict reta if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_INTEGER_4 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_INTEGER_4 *t1; + t1 = malloc (t1_dim * sizeof(GFC_INTEGER_4)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -1088,6 +1099,9 @@ matmul_i4_avx2 (gfc_array_i4 * const restrict reta } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) @@ -1422,11 +1436,15 @@ matmul_i4_avx512f (gfc_array_i4 * const restrict r if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_INTEGER_4 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_INTEGER_4 *t1; + t1 = malloc (t1_dim * sizeof(GFC_INTEGER_4)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -1641,6 +1659,9 @@ matmul_i4_avx512f (gfc_array_i4 * const restrict r } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) @@ -1971,11 +1992,15 @@ matmul_i4_vanilla (gfc_array_i4 * const restrict r if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_INTEGER_4 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_INTEGER_4 *t1; + t1 = malloc (t1_dim * sizeof(GFC_INTEGER_4)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -2190,6 +2215,9 @@ matmul_i4_vanilla (gfc_array_i4 * const restrict r } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) @@ -2578,11 +2606,15 @@ matmul_i4 (gfc_array_i4 * const restrict retarray, if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_INTEGER_4 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_INTEGER_4 *t1; + t1 = malloc (t1_dim * sizeof(GFC_INTEGER_4)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -2797,6 +2829,9 @@ matmul_i4 (gfc_array_i4 * const restrict retarray, } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) Index: generated/matmul_i8.c =================================================================== --- generated/matmul_i8.c (Revision 247753) +++ generated/matmul_i8.c (Arbeitskopie) @@ -316,11 +316,15 @@ matmul_i8_avx (gfc_array_i8 * const restrict retar if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_INTEGER_8 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_INTEGER_8 *t1; + t1 = malloc (t1_dim * sizeof(GFC_INTEGER_8)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -535,6 +539,9 @@ matmul_i8_avx (gfc_array_i8 * const restrict retar } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) @@ -869,11 +876,15 @@ matmul_i8_avx2 (gfc_array_i8 * const restrict reta if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_INTEGER_8 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_INTEGER_8 *t1; + t1 = malloc (t1_dim * sizeof(GFC_INTEGER_8)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -1088,6 +1099,9 @@ matmul_i8_avx2 (gfc_array_i8 * const restrict reta } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) @@ -1422,11 +1436,15 @@ matmul_i8_avx512f (gfc_array_i8 * const restrict r if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_INTEGER_8 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_INTEGER_8 *t1; + t1 = malloc (t1_dim * sizeof(GFC_INTEGER_8)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -1641,6 +1659,9 @@ matmul_i8_avx512f (gfc_array_i8 * const restrict r } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) @@ -1971,11 +1992,15 @@ matmul_i8_vanilla (gfc_array_i8 * const restrict r if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_INTEGER_8 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_INTEGER_8 *t1; + t1 = malloc (t1_dim * sizeof(GFC_INTEGER_8)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -2190,6 +2215,9 @@ matmul_i8_vanilla (gfc_array_i8 * const restrict r } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) @@ -2578,11 +2606,15 @@ matmul_i8 (gfc_array_i8 * const restrict retarray, if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_INTEGER_8 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_INTEGER_8 *t1; + t1 = malloc (t1_dim * sizeof(GFC_INTEGER_8)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -2797,6 +2829,9 @@ matmul_i8 (gfc_array_i8 * const restrict retarray, } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) Index: generated/matmul_r10.c =================================================================== --- generated/matmul_r10.c (Revision 247753) +++ generated/matmul_r10.c (Arbeitskopie) @@ -316,11 +316,15 @@ matmul_r10_avx (gfc_array_r10 * const restrict ret if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_REAL_10 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_REAL_10 *t1; + t1 = malloc (t1_dim * sizeof(GFC_REAL_10)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -535,6 +539,9 @@ matmul_r10_avx (gfc_array_r10 * const restrict ret } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) @@ -869,11 +876,15 @@ matmul_r10_avx2 (gfc_array_r10 * const restrict re if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_REAL_10 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_REAL_10 *t1; + t1 = malloc (t1_dim * sizeof(GFC_REAL_10)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -1088,6 +1099,9 @@ matmul_r10_avx2 (gfc_array_r10 * const restrict re } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) @@ -1422,11 +1436,15 @@ matmul_r10_avx512f (gfc_array_r10 * const restrict if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_REAL_10 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_REAL_10 *t1; + t1 = malloc (t1_dim * sizeof(GFC_REAL_10)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -1641,6 +1659,9 @@ matmul_r10_avx512f (gfc_array_r10 * const restrict } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) @@ -1971,11 +1992,15 @@ matmul_r10_vanilla (gfc_array_r10 * const restrict if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_REAL_10 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_REAL_10 *t1; + t1 = malloc (t1_dim * sizeof(GFC_REAL_10)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -2190,6 +2215,9 @@ matmul_r10_vanilla (gfc_array_r10 * const restrict } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) @@ -2578,11 +2606,15 @@ matmul_r10 (gfc_array_r10 * const restrict retarra if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_REAL_10 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_REAL_10 *t1; + t1 = malloc (t1_dim * sizeof(GFC_REAL_10)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -2797,6 +2829,9 @@ matmul_r10 (gfc_array_r10 * const restrict retarra } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) Index: generated/matmul_r16.c =================================================================== --- generated/matmul_r16.c (Revision 247753) +++ generated/matmul_r16.c (Arbeitskopie) @@ -316,11 +316,15 @@ matmul_r16_avx (gfc_array_r16 * const restrict ret if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_REAL_16 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_REAL_16 *t1; + t1 = malloc (t1_dim * sizeof(GFC_REAL_16)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -535,6 +539,9 @@ matmul_r16_avx (gfc_array_r16 * const restrict ret } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) @@ -869,11 +876,15 @@ matmul_r16_avx2 (gfc_array_r16 * const restrict re if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_REAL_16 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_REAL_16 *t1; + t1 = malloc (t1_dim * sizeof(GFC_REAL_16)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -1088,6 +1099,9 @@ matmul_r16_avx2 (gfc_array_r16 * const restrict re } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) @@ -1422,11 +1436,15 @@ matmul_r16_avx512f (gfc_array_r16 * const restrict if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_REAL_16 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_REAL_16 *t1; + t1 = malloc (t1_dim * sizeof(GFC_REAL_16)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -1641,6 +1659,9 @@ matmul_r16_avx512f (gfc_array_r16 * const restrict } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) @@ -1971,11 +1992,15 @@ matmul_r16_vanilla (gfc_array_r16 * const restrict if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_REAL_16 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_REAL_16 *t1; + t1 = malloc (t1_dim * sizeof(GFC_REAL_16)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -2190,6 +2215,9 @@ matmul_r16_vanilla (gfc_array_r16 * const restrict } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) @@ -2578,11 +2606,15 @@ matmul_r16 (gfc_array_r16 * const restrict retarra if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_REAL_16 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_REAL_16 *t1; + t1 = malloc (t1_dim * sizeof(GFC_REAL_16)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -2797,6 +2829,9 @@ matmul_r16 (gfc_array_r16 * const restrict retarra } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) Index: generated/matmul_r4.c =================================================================== --- generated/matmul_r4.c (Revision 247753) +++ generated/matmul_r4.c (Arbeitskopie) @@ -316,11 +316,15 @@ matmul_r4_avx (gfc_array_r4 * const restrict retar if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_REAL_4 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_REAL_4 *t1; + t1 = malloc (t1_dim * sizeof(GFC_REAL_4)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -535,6 +539,9 @@ matmul_r4_avx (gfc_array_r4 * const restrict retar } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) @@ -869,11 +876,15 @@ matmul_r4_avx2 (gfc_array_r4 * const restrict reta if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_REAL_4 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_REAL_4 *t1; + t1 = malloc (t1_dim * sizeof(GFC_REAL_4)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -1088,6 +1099,9 @@ matmul_r4_avx2 (gfc_array_r4 * const restrict reta } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) @@ -1422,11 +1436,15 @@ matmul_r4_avx512f (gfc_array_r4 * const restrict r if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_REAL_4 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_REAL_4 *t1; + t1 = malloc (t1_dim * sizeof(GFC_REAL_4)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -1641,6 +1659,9 @@ matmul_r4_avx512f (gfc_array_r4 * const restrict r } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) @@ -1971,11 +1992,15 @@ matmul_r4_vanilla (gfc_array_r4 * const restrict r if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_REAL_4 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_REAL_4 *t1; + t1 = malloc (t1_dim * sizeof(GFC_REAL_4)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -2190,6 +2215,9 @@ matmul_r4_vanilla (gfc_array_r4 * const restrict r } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) @@ -2578,11 +2606,15 @@ matmul_r4 (gfc_array_r4 * const restrict retarray, if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_REAL_4 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_REAL_4 *t1; + t1 = malloc (t1_dim * sizeof(GFC_REAL_4)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -2797,6 +2829,9 @@ matmul_r4 (gfc_array_r4 * const restrict retarray, } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) Index: generated/matmul_r8.c =================================================================== --- generated/matmul_r8.c (Revision 247753) +++ generated/matmul_r8.c (Arbeitskopie) @@ -316,11 +316,15 @@ matmul_r8_avx (gfc_array_r8 * const restrict retar if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_REAL_8 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_REAL_8 *t1; + t1 = malloc (t1_dim * sizeof(GFC_REAL_8)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -535,6 +539,9 @@ matmul_r8_avx (gfc_array_r8 * const restrict retar } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) @@ -869,11 +876,15 @@ matmul_r8_avx2 (gfc_array_r8 * const restrict reta if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_REAL_8 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_REAL_8 *t1; + t1 = malloc (t1_dim * sizeof(GFC_REAL_8)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -1088,6 +1099,9 @@ matmul_r8_avx2 (gfc_array_r8 * const restrict reta } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) @@ -1422,11 +1436,15 @@ matmul_r8_avx512f (gfc_array_r8 * const restrict r if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_REAL_8 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_REAL_8 *t1; + t1 = malloc (t1_dim * sizeof(GFC_REAL_8)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -1641,6 +1659,9 @@ matmul_r8_avx512f (gfc_array_r8 * const restrict r } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) @@ -1971,11 +1992,15 @@ matmul_r8_vanilla (gfc_array_r8 * const restrict r if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_REAL_8 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_REAL_8 *t1; + t1 = malloc (t1_dim * sizeof(GFC_REAL_8)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -2190,6 +2215,9 @@ matmul_r8_vanilla (gfc_array_r8 * const restrict r } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) @@ -2578,11 +2606,15 @@ matmul_r8 (gfc_array_r8 * const restrict retarray, if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" GFC_REAL_8 t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + GFC_REAL_8 *t1; + t1 = malloc (t1_dim * sizeof(GFC_REAL_8)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -2797,6 +2829,9 @@ matmul_r8 (gfc_array_r8 * const restrict retarray, } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1) Index: m4/matmul_internal.m4 =================================================================== --- m4/matmul_internal.m4 (Revision 247753) +++ m4/matmul_internal.m4 (Arbeitskopie) @@ -232,11 +232,15 @@ sinclude(`matmul_asm_'rtype_code`.m4')dnl if (t1_dim > 65536) t1_dim = 65536; +#ifdef HAVE_VLA #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" 'rtype_name` t1[t1_dim]; /* was [256][256] */ #pragma GCC diagnostic pop - +#else + 'rtype_name` *t1; + t1 = malloc (t1_dim * sizeof('rtype_name`)); +#endif /* Empty c first. */ for (j=1; j<=n; j++) for (i=1; i<=m; i++) @@ -451,6 +455,9 @@ sinclude(`matmul_asm_'rtype_code`.m4')dnl } } } +#ifndef HAVE_VLA + free(t1); +#endif return; } else if (rxstride == 1 && aystride == 1 && bxstride == 1)