From: Steve Baird <baird@adacore.com>
Date: Mon, 12 Sep 2022 22:31:19 +0000 (-0700)
Subject: ada: Improve CUDA host-side and device-side binder support
X-Git-Tag: basepoints/gcc-14~4347
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37645e2cd752e2dddcf52d70dc20eadda3e44171;p=thirdparty%2Fgcc.git

ada: Improve CUDA host-side and device-side binder support

Binder-generated code is not allowed to use Ada2012 syntax. In order to
specify an aspect, a pragma must be used.

gcc/ada/

	* bindgen.adb: When the binder is invoked for the device, specify
	the CUDA_Global aspect for the adainit and adafinal procedures via
	a pragma instead of via an aspect_specification.
---

diff --git a/gcc/ada/bindgen.adb b/gcc/ada/bindgen.adb
index b2fa44d2dffd..f2aaa2dea920 100644
--- a/gcc/ada/bindgen.adb
+++ b/gcc/ada/bindgen.adb
@@ -134,9 +134,6 @@ package body Bindgen is
    --  Text for aspect specifications (if any) given as part of the
    --  Adainit and Adafinal spec declarations.
 
-   function Aspect_Text return String is
-     (if Enable_CUDA_Device_Expansion then " with CUDA_Global" else "");
-
    ----------------------------------
    -- Interface_State Pragma Table --
    ----------------------------------
@@ -2644,10 +2641,11 @@ package body Bindgen is
       end if;
 
       WBI ("");
-      WBI ("   procedure " & Ada_Init_Name.all & Aspect_Text & ";");
+      WBI ("   procedure " & Ada_Init_Name.all & ";");
       if Enable_CUDA_Device_Expansion then
          WBI ("   pragma Export (C, " & Ada_Init_Name.all &
                 ", Link_Name => """ & Device_Ada_Init_Link_Name & """);");
+         WBI ("   pragma CUDA_Global (" & Ada_Init_Name.all & ");");
       else
          WBI ("   pragma Export (C, " & Ada_Init_Name.all & ", """ &
               Ada_Init_Name.all & """);");
@@ -2662,11 +2660,12 @@ package body Bindgen is
 
       if not Cumulative_Restrictions.Set (No_Finalization) then
          WBI ("");
-         WBI ("   procedure " & Ada_Final_Name.all & Aspect_Text & ";");
+         WBI ("   procedure " & Ada_Final_Name.all & ";");
 
          if Enable_CUDA_Device_Expansion then
             WBI ("   pragma Export (C, " & Ada_Final_Name.all &
                    ", Link_Name => """ & Device_Ada_Final_Link_Name & """);");
+            WBI ("   pragma CUDA_Global (" & Ada_Final_Name.all & ");");
          else
             WBI ("   pragma Export (C, " & Ada_Final_Name.all & ", """ &
                  Ada_Final_Name.all & """);");