diff options
| author | Ghjuvan Lacambre <lacambre@adacore.com> | 2021-01-12 13:57:59 +0100 |
|---|---|---|
| committer | Pierre-Marie de Rodat <derodat@adacore.com> | 2021-05-05 04:19:02 -0400 |
| commit | 8b7b626376e62560cd36388a85bc734758242713 (patch) | |
| tree | c488f356fd4a0e97ac7081bed3927c3d66179e80 /gcc/ada | |
| parent | d2b075f3de988b9c3bfabd06c585d5670dbcdadf (diff) | |
| download | gcc-8b7b626376e62560cd36388a85bc734758242713.zip gcc-8b7b626376e62560cd36388a85bc734758242713.tar.gz gcc-8b7b626376e62560cd36388a85bc734758242713.tar.bz2 | |
[Ada] Move Build_And_Insert_CUDA_Initialization to expansion phase
gcc/ada/
* exp_ch7.adb (Expand_N_Package_Body): Add CUDA init call.
* sem_ch7.adb (Analyze_Package_Body_Helper): Remove CUDA init
call.
Diffstat (limited to 'gcc/ada')
| -rw-r--r-- | gcc/ada/exp_ch7.adb | 8 | ||||
| -rw-r--r-- | gcc/ada/sem_ch7.adb | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/gcc/ada/exp_ch7.adb b/gcc/ada/exp_ch7.adb index 0d7a644..d3c7ca7 100644 --- a/gcc/ada/exp_ch7.adb +++ b/gcc/ada/exp_ch7.adb @@ -43,6 +43,7 @@ with Exp_Prag; use Exp_Prag; with Exp_Tss; use Exp_Tss; with Exp_Util; use Exp_Util; with Freeze; use Freeze; +with GNAT_CUDA; use GNAT_CUDA; with Lib; use Lib; with Nlists; use Nlists; with Nmake; use Nmake; @@ -5756,6 +5757,13 @@ package body Exp_Ch7 is Build_Static_Dispatch_Tables (N); end if; + -- If procedures marked with CUDA_Global have been defined within N, + -- we need to register them with the CUDA runtime at program startup. + -- This requires multiple declarations and function calls which need + -- to be appended to N's declarations. + + Build_And_Insert_CUDA_Initialization (N); + Build_Task_Activation_Call (N); -- Verify the run-time semantics of pragma Initial_Condition at the diff --git a/gcc/ada/sem_ch7.adb b/gcc/ada/sem_ch7.adb index ec510eb..dcb2af5 100644 --- a/gcc/ada/sem_ch7.adb +++ b/gcc/ada/sem_ch7.adb @@ -40,7 +40,6 @@ with Exp_Dist; use Exp_Dist; with Exp_Dbug; use Exp_Dbug; with Freeze; use Freeze; with Ghost; use Ghost; -with GNAT_CUDA; use GNAT_CUDA; with Lib; use Lib; with Lib.Xref; use Lib.Xref; with Namet; use Namet; @@ -1000,13 +999,6 @@ package body Sem_Ch7 is Analyze_List (Declarations (N)); end if; - -- If procedures marked with CUDA_Global have been defined within N, we - -- need to register them with the CUDA runtime at program startup. This - -- requires multiple declarations and function calls which need to be - -- appended to N's declarations. - - Build_And_Insert_CUDA_Initialization (N); - HSS := Handled_Statement_Sequence (N); if Present (HSS) then |