From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by sourceware.org (Postfix) with ESMTPS id 444E338582B3 for ; Fri, 4 Nov 2022 13:53:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 444E338582B3 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com Received: by mail-wr1-x42f.google.com with SMTP id bs21so7175452wrb.4 for ; Fri, 04 Nov 2022 06:53:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=iVlIRpRSwj/OjnfV3Y/+Omlj7X47cBGoICt4lTW77h4=; b=QJ4BI5fLem/SK6AUFZv2/82rhyzpw8JeX0m+rC+wUoA/DOCSvA8WBDy31CgaQygDGD ZPJ73S95CIQerirY2FICB29TnxZPStAc0pGxdWZi8K6D1HeGlcBq2O19890kUsPSvlji n5dTlXVtz51P8Da6eXwOfnjniVTJrahAxPR2CMJRdG61dkRtDTKGOOGtkgrup32y4eA2 uR46k235DnhSwSmflPQ1ETtbMQWPP6tQsf8DznFs9zEb5WSOWVAnalXAOcqSRaBwLdfw xy3dJanSNm6/k3/Zw9vpJtmDJ192zYbLfTsGXGUxMnzoa/Lj4XfUYTEexAjU7y2ViNX5 6bkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=iVlIRpRSwj/OjnfV3Y/+Omlj7X47cBGoICt4lTW77h4=; b=66fw2VEdqHVOKykpUdEcUtu8yjqPz9lj3duBtsCfgE3YSJwyDwYlV31CXzd5RRip6l PSDx/sBJdQcjY3vqNyB0lyWKEcc28IDc00g15fxw4neC9d/3Q/+fh/efl5lcpM4I2/oS I8XLaLj5dz+qrvBx/nUHhNrtUwTukOq+dW5iJDQ/bMrYu4uh97cgH/8vas4H97aHO2/W ZbNnuiVsonMZb54iVR1Sm0cVZdc5rz9+QzbC+8o228fdwrpUdnMfNnormeMkF2a8dfCR WlKP6R99Xr+GJRMB6xCMmbKsnceQcYn2NwlqlKRTsbvPOcb8/lWja7N1+tqABW2aW6ki 0oGQ== X-Gm-Message-State: ACrzQf2r44Eg1BQYyee49/du5RP/cmIa24w+Hv9orXWSNDgDnIhP50lG 3IkQtRBTT7jmEyVfa6ZbQ/nhrS01lwnINA== X-Google-Smtp-Source: AMsMyM7/0Est+enZytA4TScPBvVVJMklYpX4ROx4QuUdGJuuEiZQ8erAqLMkV2bfDY4bH4rnSNHy3Q== X-Received: by 2002:adf:ea04:0:b0:236:c7a0:5925 with SMTP id q4-20020adfea04000000b00236c7a05925mr18632389wrm.624.1667570023045; Fri, 04 Nov 2022 06:53:43 -0700 (PDT) Received: from localhost.localdomain (static-176-191-105-132.ftth.abo.bbox.fr. [176.191.105.132]) by smtp.gmail.com with ESMTPSA id l6-20020a5d5266000000b00236a16c00ffsm3496575wrc.43.2022.11.04.06.53.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Nov 2022 06:53:42 -0700 (PDT) From: =?UTF-8?q?Marc=20Poulhi=C3=A8s?= To: gcc-patches@gcc.gnu.org Cc: Steve Baird Subject: [COMMITTED] ada: Generate host-side CUDA_Register_Function calls for device's adainit/adafinal Date: Fri, 4 Nov 2022 14:53:38 +0100 Message-Id: <20221104135338.85230-1-poulhies@adacore.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-13.2 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: From: Steve Baird To invoke a device-side subprogram from the host (via a CUDA_execute pragma), the subprogram also has to be registered by calling CUDA_Register_Function. The host-side adainit and adafinal procedures need to invoke the corresponding device-side procedures, so corresponding CUDA_Register_Function calls need to be generated. gcc/ada/ * bindgen.adb (Gen_CUDA_Init): Move existing loop body into a new local procedure, Gen_CUDA_Register_Function_Call, and replace that loop body with a call to this procedure. This first part is just semantics-preserving refactoring. The second part is to add Gen_CUDA_Register_Function_Call calls after the loop for the device-side adainit and adafinal procedures. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/bindgen.adb | 66 +++++++++++++++++++++++++++++++++------------ 1 file changed, 49 insertions(+), 17 deletions(-) diff --git a/gcc/ada/bindgen.adb b/gcc/ada/bindgen.adb index f2aaa2dea92..1daa03dd7b8 100644 --- a/gcc/ada/bindgen.adb +++ b/gcc/ada/bindgen.adb @@ -1374,6 +1374,41 @@ package body Bindgen is ------------------- procedure Gen_CUDA_Init is + -- Generate call to register one function + procedure Gen_CUDA_Register_Function_Call + (Kernel_Name : String; + Kernel_String : String; + Kernel_Proc : String); + + ------------------------------------- + -- Gen_CUDA_Register_Function_Call -- + ------------------------------------- + + procedure Gen_CUDA_Register_Function_Call + (Kernel_Name : String; + Kernel_String : String; + Kernel_Proc : String) is + begin + WBI (" " & Kernel_String & " :="); + WBI (" Interfaces.C.Strings.New_Char_Array (""" + & Kernel_Name + & """);"); + + -- Generate call to CUDA runtime to register function. + 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 Gen_CUDA_Register_Function_Call; + begin if not Enable_CUDA_Expansion then return; @@ -1404,26 +1439,23 @@ package body Bindgen is 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_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 (""); + Gen_CUDA_Register_Function_Call + (Kernel_Name => Kernel_Name, + Kernel_String => Kernel_String, + Kernel_Proc => Kernel_Proc); end; end loop; + -- Register device-side Adainit and Adafinal + Gen_CUDA_Register_Function_Call + (Kernel_Name => Device_Ada_Init_Link_Name, + Kernel_String => "Adainit_Name_String", + Kernel_Proc => Device_Ada_Init_Subp_Name); + Gen_CUDA_Register_Function_Call + (Kernel_Name => Device_Ada_Final_Link_Name, + Kernel_String => "Adafinal_Name_String", + Kernel_Proc => Device_Ada_Final_Subp_Name); + WBI (" CUDA_Register_Fat_Binary_End (Fat_Binary_Handle);"); -- perform device (as opposed to host) elaboration -- 2.34.1