From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1914) id CB6EF3815FF3; Mon, 30 May 2022 08:29:40 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CB6EF3815FF3 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Pierre-Marie de Rodat To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-823] [Ada] Fix new CUDA kernel registration scheme X-Act-Checkin: gcc X-Git-Author: Ghjuvan Lacambre X-Git-Refname: refs/heads/master X-Git-Oldrev: b4e04a78bbdd39021c1d643af309a24e48623796 X-Git-Newrev: 96b2e170668673d417e9fabac041027614507eaa Message-Id: <20220530082940.CB6EF3815FF3@sourceware.org> Date: Mon, 30 May 2022 08:29:40 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 May 2022 08:29:40 -0000 https://gcc.gnu.org/g:96b2e170668673d417e9fabac041027614507eaa commit r13-823-g96b2e170668673d417e9fabac041027614507eaa Author: Ghjuvan Lacambre Date: Tue Apr 19 10:01:49 2022 +0200 [Ada] Fix new CUDA kernel registration scheme Removal of the previous kernel registration scheme unearthed mistakes in the new one, which were: - The new kernel registration code relied on the binder expansion phase, which didn't happen because the registration code was already generated by the binder. - The kernel handle passed to CUDA_Register_Function was the first eight bytes of the code of the host-side procedure representing the kernel rather than its address. gcc/ada/ * bindgen.adb (Gen_CUDA_Init): Remove code generating CUDA definitions. (Gen_CUDA_Defs): New function, generating definitions initialized by Gen_CUDA_Init. (Gen_Output_File_Ada): Call Gen_CUDA_Defs instead of Gen_CUDA_Init. (Gen_Adainit): Call Gen_CUDA_Init. Diff: --- gcc/ada/bindgen.adb | 110 ++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 77 insertions(+), 33 deletions(-) diff --git a/gcc/ada/bindgen.adb b/gcc/ada/bindgen.adb index 3b55cc9634a..c70268d4fcb 100644 --- a/gcc/ada/bindgen.adb +++ b/gcc/ada/bindgen.adb @@ -311,8 +311,11 @@ package body Bindgen is procedure Gen_CodePeer_Wrapper; -- For CodePeer, generate wrapper which calls user-defined main subprogram + procedure Gen_CUDA_Defs; + -- Generate definitions needed in order to register kernels + procedure Gen_CUDA_Init; - -- When CUDA registration code is needed. + -- Generate calls needed in order to register kernels procedure Gen_Elab_Calls (Elab_Order : Unit_Id_Array); -- Generate sequence of elaboration calls @@ -1115,6 +1118,8 @@ package body Bindgen is WBI (""); end if; + Gen_CUDA_Init; + Gen_Elab_Calls (Elab_Order); if not CodePeer_Mode then @@ -1221,10 +1226,10 @@ package body Bindgen is end Gen_Bind_Env_String; ------------------- - -- Gen_CUDA_Init -- + -- Gen_CUDA_Defs -- ------------------- - procedure Gen_CUDA_Init is + procedure Gen_CUDA_Defs is Unit_Name : constant String := Get_Name_String (Units.Table (First_Unit_Entry).Uname); Unit : constant String := @@ -1237,7 +1242,7 @@ package body Bindgen is WBI (""); WBI (" "); - WBI (" function CUDA_Register_Function"); + WBI (" procedure CUDA_Register_Function"); WBI (" (Fat_Binary_Handle : System.Address;"); WBI (" Func : System.Address;"); WBI (" Kernel_Name : Interfaces.C.Strings.chars_ptr;"); @@ -1247,7 +1252,7 @@ package body Bindgen is WBI (" Nullptr2 : System.Address;"); WBI (" Nullptr3 : System.Address;"); WBI (" Nullptr4 : System.Address;"); - WBI (" Nullptr5 : System.Address) return Boolean;"); + WBI (" Nullptr5 : System.Address);"); WBI (" pragma Import"); WBI (" (Convention => C,"); WBI (" Entity => CUDA_Register_Function,"); @@ -1261,8 +1266,8 @@ package body Bindgen is WBI (" Entity => CUDA_Register_Fat_Binary,"); WBI (" External_Name => ""__cudaRegisterFatBinary"");"); WBI (""); - WBI (" function CUDA_Register_Fat_Binary_End"); - WBI (" (Fat_Binary : System.Address) return Boolean;"); + WBI (" procedure CUDA_Register_Fat_Binary_End"); + WBI (" (Fat_Binary : System.Address);"); WBI (" pragma Import"); WBI (" (Convention => C,"); WBI (" Entity => CUDA_Register_Fat_Binary_End,"); @@ -1287,8 +1292,7 @@ package body Bindgen is WBI (" Fat_Binary'Address,"); WBI (" System.Null_Address);"); WBI (""); - WBI (" Fat_Binary_Handle : System.Address :="); - WBI (" CUDA_Register_Fat_Binary (Wrapper'Address);"); + WBI (" Fat_Binary_Handle : System.Address;"); WBI (""); for K in CUDA_Kernels.First .. CUDA_Kernels.Last loop @@ -1300,9 +1304,9 @@ package body Bindgen is -- K_Symbol is a unique identifier used to derive all symbol names -- related to kernel K. - Kernel_Addr : constant String := Kernel_Symbol & "_Addr"; - -- Kernel_Addr is the name of the symbol representing the address - -- of the host-side procedure of the kernel. The address is + Kernel_Proc : constant String := Kernel_Symbol & "_Proc"; + -- Kernel_Proc is the name of the symbol representing the + -- host-side procedure of the kernel. The address is -- pragma-imported and then used while registering the kernel with -- the CUDA runtime. Kernel_String : constant String := Kernel_Symbol & "_String"; @@ -1315,40 +1319,80 @@ package body Bindgen is begin -- Import host-side kernel address. - WBI (" " & Kernel_Addr & " : constant System.Address;"); + WBI (" procedure " & Kernel_Proc & ";"); WBI (" pragma Import"); WBI (" (Convention => C,"); - WBI (" Entity => " & Kernel_Addr & ","); + WBI (" Entity => " & Kernel_Proc & ","); WBI (" External_Name => """ & Kernel_Name & """);"); WBI (""); -- Generate C-string containing name of kernel. WBI - (" " & Kernel_String & " : Interfaces.C.Strings.Chars_Ptr :="); - WBI (" Interfaces.C.Strings.New_Char_Array (""" - & Kernel_Name - & """);"); + (" " & Kernel_String & " : Interfaces.C.Strings.Chars_Ptr;"); WBI (""); + end; + end loop; + + WBI (""); + end Gen_CUDA_Defs; + + ------------------- + -- Gen_CUDA_Init -- + ------------------- + + procedure Gen_CUDA_Init is + begin + if not Enable_CUDA_Expansion then + return; + end if; + + WBI (" Fat_Binary_Handle :="); + WBI (" CUDA_Register_Fat_Binary (Wrapper'Address);"); + + for K in CUDA_Kernels.First .. CUDA_Kernels.Last loop + declare + K_String : constant String := CUDA_Kernel_Id'Image (K); + N : constant String := + K_String (K_String'First + 1 .. K_String'Last); + Kernel_Symbol : constant String := "Kernel_" & N; + -- K_Symbol is a unique identifier used to derive all symbol names + -- related to kernel K. + + Kernel_Proc : constant String := Kernel_Symbol & "_Proc"; + -- Kernel_Proc is the name of the symbol representing the + -- host-side procedure of the kernel. The address is + -- pragma-imported and then used while registering the kernel with + -- the CUDA runtime. + Kernel_String : constant String := Kernel_Symbol & "_String"; + -- Kernel_String is the name of the C-string containing the name + -- of the kernel. It is used for registering the kernel with the + -- CUDA runtime. + Kernel_Name : constant String := + Get_Name_String (CUDA_Kernels.Table (K).Kernel_Name); + -- Kernel_Name is the name of the kernel, after package expansion. + begin + WBI (" " & Kernel_String & " :="); + WBI (" Interfaces.C.Strings.New_Char_Array (""" + & Kernel_Name + & """);"); -- Generate call to CUDA runtime to register function. - WBI (" CUDA_Register" & N & " : Boolean :="); - WBI (" CUDA_Register_Function ("); - WBI (" Fat_Binary_Handle, "); - WBI (" " & Kernel_Addr & ","); - WBI (" " & Kernel_String & ","); - WBI (" " & Kernel_String & ","); - WBI (" -1,"); - WBI (" System.Null_Address,"); - WBI (" System.Null_Address,"); - WBI (" System.Null_Address,"); - WBI (" System.Null_Address,"); - WBI (" System.Null_Address);"); + WBI (" CUDA_Register_Function ("); + WBI (" Fat_Binary_Handle, "); + WBI (" " & Kernel_Proc & "'Address,"); + WBI (" " & Kernel_String & ","); + WBI (" " & Kernel_String & ","); + WBI (" -1,"); + WBI (" System.Null_Address,"); + WBI (" System.Null_Address,"); + WBI (" System.Null_Address,"); + WBI (" System.Null_Address,"); + WBI (" System.Null_Address);"); WBI (""); end; end loop; - WBI (" CUDA_End : Boolean := "); - WBI (" CUDA_Register_Fat_Binary_End(Fat_Binary_Handle);"); + WBI (" CUDA_Register_Fat_Binary_End (Fat_Binary_Handle);"); end Gen_CUDA_Init; -------------------------- @@ -2619,7 +2663,7 @@ package body Bindgen is Get_Main_Name & """);"); end if; - Gen_CUDA_Init; + Gen_CUDA_Defs; -- Generate version numbers for units, only if needed. Be very safe on -- the condition.