Hi! On 2023-02-16T18:06:41+0000, Andrew Stubbs <a...@codesourcery.com> wrote: > 1. 230216-basic-allocator.patch > > Separate the allocator from NVPTX so the code can be shared.
Yay! > nvptx, libgomp: Move the low-latency allocator code > > There shouldn't be a functionality change; this is just so AMD can share > the code. I've quickly observed one "functionality" change: > --- /dev/null > +++ b/libgomp/basic-allocator.c > +#ifndef BASIC_ALLOC_YIELD > +#deine BASIC_ALLOC_YIELD > +#endif In file included from [...]/libgomp/config/nvptx/allocator.c:49: [...]/libgomp/config/nvptx/../../basic-allocator.c:52:2: error: invalid preprocessing directive #deine; did you mean #define? 52 | #deine BASIC_ALLOC_YIELD | ^~~~~ | define Yes, indeed. I've pushed to devel/omp/gcc-12 branch commit 6cc0e7bebf1b3ad6aacf75419e7f06942409f90c "Un-break nvptx libgomp build", see attached. Grüße Thomas ----------------- 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
>From 6cc0e7bebf1b3ad6aacf75419e7f06942409f90c Mon Sep 17 00:00:00 2001 From: Thomas Schwinge <tho...@codesourcery.com> Date: Thu, 16 Feb 2023 21:59:55 +0100 Subject: [PATCH] Un-break nvptx libgomp build In file included from [...]/libgomp/config/nvptx/allocator.c:49: [...]/libgomp/config/nvptx/../../basic-allocator.c:52:2: error: invalid preprocessing directive #deine; did you mean #define? 52 | #deine BASIC_ALLOC_YIELD | ^~~~~ | define Yes, indeed. Fix-up for og12 commit 9583738a62a33a276b2aad980a27e77097f95924 "nvptx, libgomp: Move the low-latency allocator code". libgomp/ * basic-allocator.c (BASIC_ALLOC_YIELD): instead of '#deine', '#define' it. --- libgomp/ChangeLog.omp | 3 +++ libgomp/basic-allocator.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp index ecc14b4f537..b667c72b8ca 100644 --- a/libgomp/ChangeLog.omp +++ b/libgomp/ChangeLog.omp @@ -1,5 +1,8 @@ 2023-02-16 Thomas Schwinge <tho...@codesourcery.com> + * basic-allocator.c (BASIC_ALLOC_YIELD): instead of '#deine', + '#define' it. + * testsuite/libgomp.c/usm-1.c: Re-enable non-GCN offloading compilation. * testsuite/libgomp.c/usm-2.c: Likewise. diff --git a/libgomp/basic-allocator.c b/libgomp/basic-allocator.c index 94b99a89e0b..b4b9e4ba13a 100644 --- a/libgomp/basic-allocator.c +++ b/libgomp/basic-allocator.c @@ -49,7 +49,7 @@ #endif #ifndef BASIC_ALLOC_YIELD -#deine BASIC_ALLOC_YIELD +#define BASIC_ALLOC_YIELD #endif #define ALIGN(VAR) (((VAR) + 7) & ~7) /* 8-byte granularity. */ -- 2.25.1