From patchwork Fri Oct 1 09:32:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tobias Burnus X-Patchwork-Id: 45670 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 20A0F3857C7A for ; Fri, 1 Oct 2021 09:33:00 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from esa4.mentor.iphmx.com (esa4.mentor.iphmx.com [68.232.137.252]) by sourceware.org (Postfix) with ESMTPS id BDDA33858C2C; Fri, 1 Oct 2021 09:32:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org BDDA33858C2C Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=mentor.com IronPort-SDR: LLQIkMsv6rWoKWQw0CDnS50s1jMfseKxJkAEC3h6ei+pjgJNGLdPeBsgftic3WIhEr4ZezlthF M2XNVat8S2oOBCTFOh+j5gIKSEC/p3suErGgSWJckqmV0N9tFyh7dIrb3x2dP+K41qTvez4MWn cSi2QW8M862ysxA2wffJ5URl9KAXwkVnrbIpmyItVaWHHyU4KdTqIqXXrU1POAQJr5PPjodGVp puDEc5iwe6n00pCFuh63w628x8jGo3lRQyufC89gWe00hPR7Uf2qUOb3EMdLbTLdKrKeBetESD JTjgHMaCS0V7/zRs4Y/VYPg+ X-IronPort-AV: E=Sophos;i="5.85,337,1624348800"; d="diff'?scan'208";a="66710267" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa4.mentor.iphmx.com with ESMTP; 01 Oct 2021 01:32:32 -0800 IronPort-SDR: 87w6dhv+Aa1KWcEUZj0ew//5FfnxQt5CH8P3NZtuixATgkBEhnio6w5RLZz2q4JB3Jp2nHF3yw PCBtprVKvq0cmkSNV+D0nVQnCaXe4JkNQIXDiX9+huQoiuIGDU8C+R0GJKc7VqvRiRc1v4awsJ Ar61IEyE3Bwm5pNl0yP23aZ3y1Z6ZJIcd3t53R0SEef2KsVXubhNf+revofeVywM4jlU9bNoLv hYCFVmatCc9fk4w6wRXbitW5o4LfJlRmkouiZuO77aqut8hpWZxZ2GXA2JHjV9wvwKGF4m5Y9U EHM= Subject: [Patch] Add/update libgomp.fortran/alloc-*.f90 [Re: [committed] openmp: Add alloc_align attribute to omp_aligned_*alloc and testcase for omp_realloc] To: Jakub Jelinek , , fortran References: <20211001085917.GG304296@tucnak> From: Tobias Burnus Message-ID: <47ea0954-0b7f-7359-2998-b752898b3e76@codesourcery.com> Date: Fri, 1 Oct 2021 11:32:24 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.14.0 MIME-Version: 1.0 In-Reply-To: <20211001085917.GG304296@tucnak> Content-Language: en-US X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: SVR-IES-MBX-04.mgc.mentorg.com (139.181.222.4) To svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tobias Burnus Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" ... and attached the Fortran version of the C/C++ testcase. OK? Tobias On 01.10.21 10:59, Jakub Jelinek wrote: > 2021-10-01 Jakub Jelinek > > * omp.h.in (omp_aligned_alloc, omp_aligned_calloc): Add > __alloc_align__ (1) attribute. > * testsuite/libgomp.c-c++-common/alloc-9.c: New test. ----------------- Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634 München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht München, HRB 106955 Add/update libgomp.fortran/alloc-*.f90 libgomp/ChangeLog: * testsuite/libgomp.fortran/alloc-10.f90: Fix alignment check. * testsuite/libgomp.fortran/alloc-7.f90: Fix array access. * testsuite/libgomp.fortran/alloc-8.f90: Likewise. * testsuite/libgomp.fortran/alloc-11.f90: New test for omp_realloc, based on libgomp.c-c++-common/alloc-9.c. libgomp/testsuite/libgomp.fortran/alloc-10.f90 | 4 +- libgomp/testsuite/libgomp.fortran/alloc-11.f90 | 301 +++++++++++++++++++++++++ libgomp/testsuite/libgomp.fortran/alloc-7.f90 | 14 +- libgomp/testsuite/libgomp.fortran/alloc-8.f90 | 2 +- 4 files changed, 311 insertions(+), 10 deletions(-) diff --git a/libgomp/testsuite/libgomp.fortran/alloc-10.f90 b/libgomp/testsuite/libgomp.fortran/alloc-10.f90 index 060c16f312b..3eab8598dec 100644 --- a/libgomp/testsuite/libgomp.fortran/alloc-10.f90 +++ b/libgomp/testsuite/libgomp.fortran/alloc-10.f90 @@ -134,7 +134,7 @@ program main ip(420 / c_sizeof (0)) = 6 q = omp_aligned_calloc (8_c_size_t, 24_c_size_t, 32_c_size_t, a2) call c_f_pointer (q, iq, [768 / c_sizeof (0)]) - if (mod (TRANSFER (p, iptr), 16) /= 0) & + if (mod (TRANSFER (q, iptr), 16) /= 0) & stop 18 do i = 1, 768 / c_sizeof (0) if (iq(i) /= 0) & @@ -144,7 +144,7 @@ program main iq(768 / c_sizeof (0)) = 8 r = omp_aligned_calloc (8_c_size_t, 64_c_size_t, 8_c_size_t, a2) call c_f_pointer (r, ir, [512 / c_sizeof (0)]) - if (mod (TRANSFER (p, iptr), 8) /= 0) & + if (mod (TRANSFER (r, iptr), 8) /= 0) & stop 20 do i = 1, 512 / c_sizeof (0) if (ir(i) /= 0) & diff --git a/libgomp/testsuite/libgomp.fortran/alloc-11.f90 b/libgomp/testsuite/libgomp.fortran/alloc-11.f90 new file mode 100644 index 00000000000..22b4f92a336 --- /dev/null +++ b/libgomp/testsuite/libgomp.fortran/alloc-11.f90 @@ -0,0 +1,301 @@ +! { dg-additional-sources alloc-7.c } +! { dg-prune-output "command-line option '-fintrinsic-modules-path=.*' is valid for Fortran but not for C" } +module m + use omp_lib + use iso_c_binding + implicit none + + type (omp_alloctrait), parameter :: traits2(*) & + = [ omp_alloctrait (omp_atk_alignment, 16), & + omp_alloctrait (omp_atk_sync_hint, omp_atv_default), & + omp_alloctrait (omp_atk_access, omp_atv_default), & + omp_alloctrait (omp_atk_pool_size, 1024), & + omp_alloctrait (omp_atk_fallback, omp_atv_default_mem_fb), & + omp_alloctrait (omp_atk_partition, omp_atv_environment)] + type (omp_alloctrait) :: traits3(7) & + = [ omp_alloctrait (omp_atk_sync_hint, omp_atv_uncontended), & + omp_alloctrait (omp_atk_alignment, 32), & + omp_alloctrait (omp_atk_access, omp_atv_all), & + omp_alloctrait (omp_atk_pool_size, 512), & + omp_alloctrait (omp_atk_fallback, omp_atv_allocator_fb), & + omp_alloctrait (omp_atk_fb_data, 0), & + omp_alloctrait (omp_atk_partition, omp_atv_default)] + + type (omp_alloctrait), parameter :: traits4(*) & + = [ omp_alloctrait (omp_atk_alignment, 128), & + omp_alloctrait (omp_atk_pool_size, 1024), & + omp_alloctrait (omp_atk_fallback, omp_atv_null_fb)] + + interface + integer(c_int) function get__alignof_int () bind(C) + import :: c_int + end + end interface +end module m + +program main + use m + implicit none (external, type) + type(c_ptr) :: p, q, r + integer, pointer, contiguous :: ip(:), iq(:), ir(:) + type (omp_alloctrait) :: traits(3) + type (omp_alloctrait) :: traits5(2) + integer (omp_allocator_handle_kind) :: a, a2 + integer (c_ptrdiff_t) :: iptr + + traits = [ omp_alloctrait (omp_atk_alignment, 64), & + omp_alloctrait (omp_atk_fallback, omp_atv_null_fb), & + omp_alloctrait (omp_atk_pool_size, 4096)] + traits5 = [ omp_alloctrait (omp_atk_fallback, omp_atv_null_fb), & + omp_alloctrait (omp_atk_pool_size, 4096)] + + p = omp_alloc (3 * c_sizeof (0), omp_default_mem_alloc) + call c_f_pointer (p, ip, [3]) + if (mod (TRANSFER (p, iptr), get__alignof_int ()) /= 0) & + stop 1 + ip(1) = 1 + ip(2) = 2 + ip(3) = 3 + p = omp_realloc (p, 4 * c_sizeof (0), omp_default_mem_alloc, omp_default_mem_alloc) + call c_f_pointer (p, ip, [4]) + if (mod (TRANSFER (p, iptr), get__alignof_int ()) /= 0 & + .or. ip(1) /= 1 .or. ip(2) /= 2 .or. ip(3) /= 3) & + stop 2 + ip(1) = 4 + ip(2) = 5 + ip(3) = 6 + ip(4) = 7 + p = omp_realloc (p, 2 * c_sizeof (0), omp_default_mem_alloc, omp_default_mem_alloc) + call c_f_pointer (p, ip, [2]) + if (mod (TRANSFER (p, iptr), get__alignof_int ()) /= 0 & + .or. ip(1) /= 4 .or. ip(2) /= 5) & + stop 3 + ip(1) = 8 + ip(2) = 9 + if (c_associated (omp_realloc (p, 0_c_size_t, omp_null_allocator, omp_default_mem_alloc))) & + stop 4 + p = omp_realloc (c_null_ptr, 2 * c_sizeof (0), omp_default_mem_alloc, omp_null_allocator) + call c_f_pointer (p, ip, [2]) + if (mod (TRANSFER (p, iptr), get__alignof_int ()) /= 0) & + stop 5 + ip(1) = 1 + ip(2) = 2 + p = omp_realloc (p, 5 * c_sizeof (0), omp_default_mem_alloc, omp_default_mem_alloc) + call c_f_pointer (p, ip, [5]) + if (mod (TRANSFER (p, iptr), get__alignof_int ()) /= 0 & + .or. ip(1) /= 1 .or. ip(2) /= 2) & + stop 6 + ip(1) = 3 + ip(2) = 4 + ip(3) = 5 + ip(4) = 6 + ip(5) = 7 + call omp_free (p, omp_null_allocator) + call omp_set_default_allocator (omp_default_mem_alloc) + if (c_associated (omp_realloc (c_null_ptr, 0_c_size_t, omp_null_allocator, omp_null_allocator))) & + stop 7 + p = omp_alloc (c_sizeof (0), omp_null_allocator) + call c_f_pointer (p, ip, [1]) + if (mod (TRANSFER (p, iptr), get__alignof_int ()) /= 0) & + stop 8 + ip(1) = 3 + p = omp_realloc (p, 3 * c_sizeof (0), omp_null_allocator, omp_null_allocator) + call c_f_pointer (p, ip, [3]) + if (mod (TRANSFER (p, iptr), get__alignof_int ()) /= 0 & + .or. ip(1) /= 3) & + stop 9 + ip(1) = 4 + ip(2) = 5 + ip(3) = 6 + if (c_associated (omp_realloc (p, 0_c_size_t, omp_null_allocator, omp_get_default_allocator ()))) & + stop 10 + a = omp_init_allocator (omp_default_mem_space, 3, traits) + if (a == omp_null_allocator) & + stop 11 + p = omp_alloc (c_sizeof (0), a) + call c_f_pointer (p, ip, [1]) + if (mod (TRANSFER (p, iptr), 64) /= 0) & + stop 12 + ip(1) = 7 + p = omp_realloc (p, 3072_c_size_t, a, a) + call c_f_pointer (p, ip, [3072 / c_sizeof (0)]) + if (mod (TRANSFER (p, iptr), 64) /= 0 & + .or. ip(1) /= 7) & + stop 13 + ip(1) = 1 + ip(3072 / c_sizeof (0)) = 2 + q = omp_alloc (c_sizeof (0), a) + call c_f_pointer (q, iq, [1]) + if (mod (TRANSFER (q, iptr), 64) /= 0) & + stop 14 + iq(1) = 8 + if (c_associated (omp_realloc (q, 3072_c_size_t, a, a))) & + stop 15 + call omp_free (p, a) + call omp_free (q, a) + p = omp_alloc (c_sizeof (0), a) + call c_f_pointer (p, ip, [1]) + ip(1) = 42 + p = omp_realloc (p, 3072_c_size_t, a, a) + call c_f_pointer (p, ip, [3072 / c_sizeof (0)]) + if (ip(1) /= 42) & + stop 16 + ip(1) = 3 + ip(3072 / c_sizeof (0)) = 4 + ! ignore return value + r = omp_realloc (p, 0_c_size_t, omp_null_allocator, omp_null_allocator) + call omp_set_default_allocator (a) + if (omp_get_default_allocator () /= a) & + stop 17 + p = omp_alloc (31_c_size_t, omp_null_allocator) + if (.not. c_associated (p)) & + stop 18 + p = omp_realloc (p, 3072_c_size_t, omp_null_allocator, omp_null_allocator) + if (.not. c_associated (p)) & + stop 19 + q = omp_alloc (c_sizeof (0), omp_null_allocator) + if (.not. c_associated (q)) & + stop 20 + if (c_associated (omp_realloc (q, 3072_c_size_t, omp_null_allocator, omp_null_allocator))) & + stop 21 + call omp_free (p, a) + call omp_free (q, a) + call omp_destroy_allocator (a) + + a = omp_init_allocator (omp_default_mem_space, 2, traits5) + if (a == omp_null_allocator) & + stop 22 + call omp_set_default_allocator (a) + if (omp_get_default_allocator () /= a) & + stop 23 + p = omp_alloc (3071_c_size_t, omp_null_allocator) + if (.not. c_associated (p)) & + stop 24 + p = omp_realloc (p, 3072_c_size_t, omp_null_allocator, omp_null_allocator) + if (.not. c_associated (p)) & + stop 25 + q = omp_alloc (c_sizeof (0), omp_null_allocator) + if (.not. c_associated (q)) & + stop 26 + if (c_associated (omp_realloc (q, 3072_c_size_t, omp_null_allocator, omp_null_allocator))) & + stop 27 + call omp_free (p, a) + call omp_free (q, a) + call omp_destroy_allocator (a) + + a = omp_init_allocator (omp_default_mem_space, size (traits2), traits2) + if (a == omp_null_allocator) & + stop 28 + if (traits3(6)%key /= omp_atk_fb_data) & + stop 29 + traits3(6)%value = a + a2 = omp_init_allocator (omp_default_mem_space, size (traits3), traits3) + if (a2 == omp_null_allocator) & + stop 30 + p = omp_alloc (c_sizeof (0), a2) + call c_f_pointer (p, ip, [1]) + if (mod (TRANSFER (p, iptr), 32) /= 0) & + stop 31 + ip(1) = 84 + p = omp_realloc (p, 380_c_size_t, a2, a2) + call c_f_pointer (p, ip, [380 / c_sizeof (0)]) + if (mod (TRANSFER (p, iptr), 32) /= 0 & + .or. ip(1) /= 84) & + stop 32 + ip(1) = 5 + ip(380 / c_sizeof (0)) = 6 + q = omp_alloc (c_sizeof (0), a2) + call c_f_pointer (q, iq, [1]) + if (mod (TRANSFER (q, iptr), 32) /= 0) & + stop 33 + iq(1) = 42 + q = omp_realloc (q, 768_c_size_t, a2, a2) + call c_f_pointer (q, iq, [768 / c_sizeof (0)]) + if (mod (TRANSFER (q, iptr), 16) /= 0 & + .or. iq(1) /= 42) & + stop 34 + iq(1) = 7 + iq(768 / c_sizeof (0)) = 8 + r = omp_realloc (c_null_ptr, 512_c_size_t, a2, omp_null_allocator) + call c_f_pointer (r, ir, [512 / c_sizeof (0)]) + if (mod (TRANSFER (r, iptr), get__alignof_int ()) /= 0) & + stop 35 + ir(1) = 9 + ir(512 / c_sizeof (0)) = 10 + call omp_free (p, omp_null_allocator) + call omp_free (q, a2) + call omp_free (r, omp_null_allocator) + p = omp_alloc (c_sizeof (0), a2) + call c_f_pointer (p, ip, [1]) + if (mod (TRANSFER (p, iptr), 32) /= 0) & + stop 36 + ip(1) = 85 + p = omp_realloc (p, 420_c_size_t, a, a2) + call c_f_pointer (p, ip, [420 / c_sizeof (0)]) + if (mod (TRANSFER (p, iptr), 16) /= 0 & + .or. ip(1) /= 85) & + stop 37 + ip(1) = 5 + ip(420 / c_sizeof (0)) = 6 + q = omp_alloc (c_sizeof (0), a) + call c_f_pointer (q, iq, [1]) + if (mod (TRANSFER (q, iptr), 16) /= 0) & + stop 38 + iq(1) = 43 + q = omp_realloc (q, 420_c_size_t, a2, a) + call c_f_pointer (q, iq, [420 / c_sizeof (0)]) + if (mod (TRANSFER (q, iptr), 32) /= 0 & + .or. iq(1) /= 43) & + stop 39 + iq(1) = 44 + iq(420 / c_sizeof (0)) = 8 + q = omp_realloc (q, 768_c_size_t, a2, a2) + call c_f_pointer (q, iq, [768 / c_sizeof (0)]) + if (mod (TRANSFER (q, iptr), 16) /= 0 & + .or. iq(1) /= 44) & + stop 40 + iq(1) = 7 + iq(768 / c_sizeof (0)) = 8 + call omp_free (p, omp_null_allocator) + call omp_free (q, a2) + call omp_destroy_allocator (a2) + call omp_destroy_allocator (a) + + a = omp_init_allocator (omp_default_mem_space, size (traits4), traits4) + if (a == omp_null_allocator) & + stop 41 + if (traits3(6)%key /= omp_atk_fb_data) & + stop 1 + traits3(6)%value = a + a2 = omp_init_allocator (omp_default_mem_space, size (traits3), traits3) + if (a2 == omp_null_allocator) & + stop 42 + call omp_set_default_allocator (a2) + p = omp_realloc (c_null_ptr, 420_c_size_t, omp_null_allocator, omp_null_allocator) + call c_f_pointer (p, ip, [420 / c_sizeof (0)]) + if (mod (TRANSFER (p, iptr), 32) /= 0) & + stop 43 + ip(1) = 5 + ip(420 / c_sizeof (0)) = 6 + q = omp_realloc (c_null_ptr, c_sizeof (0), omp_null_allocator, omp_null_allocator) + call c_f_pointer (q, iq, [1]) + if (mod (TRANSFER (q, iptr), 32) /= 0) & + stop 44 + iq(1) = 99 + q = omp_realloc (q, 700_c_size_t, omp_null_allocator, omp_null_allocator) + call c_f_pointer (q, iq, [700 / c_sizeof (0)]) + if (mod (TRANSFER (q, iptr), 128) /= 0 & + .or. iq(1) /= 99) & + stop 45 + iq(1) = 7 + iq(700 / c_sizeof (0)) = 8 + if (c_associated (omp_realloc (c_null_ptr, 768_c_size_t, omp_null_allocator, omp_null_allocator))) & + stop 46 + call omp_free (p, omp_null_allocator) + if (c_associated (omp_realloc (q, 0_c_size_t, omp_null_allocator, omp_null_allocator))) & + stop 47 + call omp_free (c_null_ptr, omp_null_allocator) + call omp_free (c_null_ptr, omp_null_allocator) + call omp_destroy_allocator (a2) + call omp_destroy_allocator (a) +end program main diff --git a/libgomp/testsuite/libgomp.fortran/alloc-7.f90 b/libgomp/testsuite/libgomp.fortran/alloc-7.f90 index d8c7eee8c25..57ecd839c26 100644 --- a/libgomp/testsuite/libgomp.fortran/alloc-7.f90 +++ b/libgomp/testsuite/libgomp.fortran/alloc-7.f90 @@ -50,17 +50,17 @@ program main call c_f_pointer (p, ip, [3]) if (mod (TRANSFER (p, iptr), get__alignof_int ()) /= 0) & stop 1 - ip(0) = 1 - ip(1) = 2 - ip(2) = 3 + ip(1) = 1 + ip(2) = 2 + ip(3) = 3 call omp_free (p, omp_default_mem_alloc) p = omp_aligned_alloc (2 * c_sizeof (0), 2 * c_sizeof (0), omp_default_mem_alloc) call c_f_pointer (p, ip, [2]) if (mod (TRANSFER (p, iptr), 2 * c_sizeof (0)) /= 0) & stop 2 - ip(0) = 1 - ip(1) = 2 + ip(1) = 1 + ip(2) = 2 call omp_free (p, omp_null_allocator) call omp_set_default_allocator (omp_default_mem_alloc) @@ -68,7 +68,7 @@ program main call c_f_pointer (p, ip, [2]) if (mod (TRANSFER (p, iptr), get__alignof_int ()) /= 0) & stop 3 - ip(0) = 3 + ip(1) = 3 call omp_free (p, omp_get_default_allocator ()) a = omp_init_allocator (omp_default_mem_space, 3, traits) @@ -155,7 +155,7 @@ program main call c_f_pointer (p, ip, [420/c_sizeof (0)]) if (mod (TRANSFER (p, iptr), 32) /= 0) & stop 18 - ip(0) = 5 + ip(1) = 5 ip(420 / c_sizeof (0)) = 6 q = omp_aligned_alloc (64_c_size_t, 768_c_size_t, omp_null_allocator) diff --git a/libgomp/testsuite/libgomp.fortran/alloc-8.f90 b/libgomp/testsuite/libgomp.fortran/alloc-8.f90 index 4bff4d6ea29..059c368781e 100644 --- a/libgomp/testsuite/libgomp.fortran/alloc-8.f90 +++ b/libgomp/testsuite/libgomp.fortran/alloc-8.f90 @@ -41,7 +41,7 @@ program main call omp_free (p, a) large_sz = NOT (0_c_size_t) large_sz = ISHFT (large_sz, -1) - large_sz = large_sz + 1 + large_sz = large_sz + 1 ! signed integer overflow if (c_associated (omp_calloc (2_c_size_t, large_sz, a))) & stop 7 if (c_associated (omp_calloc (large_sz, 1024_c_size_t, a))) &