On 2022/8/15 7:15 PM, Chung-Lin Tang wrote:
> On 2022/8/15 7:06 PM, Chung-Lin Tang wrote:
>>
>> I know this is a big pile of yarn wrt how the main program/libgomp/libgfortran interacts, but it's
>> finally working. Again tested without regressions. Preparing to commit to devel/omp/gcc-12, and seeking
>> approval for mainline when the requires patches are in.
> 
> Just realized that I don't have the new testcases added in this patch.
> Will supplement them later :P

Here's the USM allocator/libgfortran patch, with a libgomp.fortran testcase added.

Thanks,
Chung-Lin

2022-09-05  Chung-Lin Tang  <cltang@codesourcery.com>

libgcc/
     * Makefile.in (crtoffloadend$(objext)): Add $(PICFLAG) to compile rule.
     * offloadstuff.c (GOMP_offload_register_ver): Add declaration of weak
     symbol.
     (__OFFLOAD_TABLE__): Likewise.
     (init_non_offload): New function.

libgfortran/

     * gfortran.map (GFORTRAN_13): New namespace.
     (_gfortran_mem_allocators_init): New name inside GFORTRAN_13.
     * libgfortran.h (mem_allocators_init): New exported declaration.
     * runtime/main.c (do_init): Rename from init, add run-once guard code.
     (cleanup): Add run-once guard code.
     (GOMP_post_offload_register_callback): Declare weak symbol.
     (GOMP_pre_gomp_target_fini_callback): Likewise.
     (init): New constructor to register offload callbacks, or call do_init
     when not OpenMP.
     * runtime/memory.c (gfortran_malloc): New pointer variable.
     (gfortran_calloc): Likewise.
     (gfortran_realloc): Likewise.
     (gfortran_free): Likewise.
     (mem_allocators_init): New function.
     (xmalloc): Use gfortran_malloc.
     (xmallocarray): Use gfortran_malloc.
     (xcalloc): Use gfortran_calloc.
     (xrealloc): Use gfortran_realloc.
     (xfree): Use gfortran_free.

libgomp/

     * libgomp.map (GOMP_5.1.2): New version namespace.
     (GOMP_post_offload_register_callback): New name inside GOMP_5.1.2.
     (GOMP_pre_gomp_target_fini_callback): Likewise.
     (GOMP_DEFINE_CALLBACK_SET): Macro to define callback set.
     (post_offload_register): Define callback set for after offload image
     register.
     (pre_gomp_target_fini): Define callback set for before gomp_target_fini
     is called.
     (libgfortran_malloc_usm): New function.
     (libgfortran_calloc_usm): Likewise
     (libgfortran_realloc_usm): Likewise
     (libgfortran_free_usm): Likewise.
     (_gfortran_mem_allocators_init): Declare weak symbol.
     (gomp_libgfortran_omp_allocators_init): New function.
     (GOMP_offload_register_ver): Add handling of host_table == NULL, calling
     into libgfortran to set unified_shared_memory allocators, and execution
     of post_offload_register callbacks.
     (gomp_target_init): Register all pre_gomp_target_fini callbacks to run
     at end of main using atexit().

     * testsuite/libgomp.fortran/target-unified_shared_memory-1.f90: New test.