Skip to content

Commit

Permalink
Merge branch 'topic/kliemann/bb-runtimes-74-native-light-tasking' int…
Browse files Browse the repository at this point in the history
…o 'master'

Implement light-tasking on Linux

See merge request eng/toolchain/bb-runtimes!127
  • Loading branch information
jklmnn committed Oct 3, 2024
2 parents 376e062 + 5d0b7f4 commit aacdcf5
Show file tree
Hide file tree
Showing 6 changed files with 454 additions and 4 deletions.
16 changes: 13 additions & 3 deletions linux/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ class Linux(DFBBTarget):
def __init__(self):
super().__init__()
self.add_gnat_sources("src/s-macres__native.adb")
self.add_gnarl_sources("linux/adaint.c")

def has_libc(self, profile):
return True
Expand Down Expand Up @@ -34,7 +35,10 @@ def target(self):

@property
def system_ads(self):
return {"light": "system-native-x86-light.ads"}
return {
"light": "system-native-x86-light.ads",
"light-tasking": "system-native-x86-light-tasking.ads",
}


class X8664Linux(Linux):
Expand All @@ -48,7 +52,10 @@ def is_64bit(self):

@property
def system_ads(self):
return {"light": "system-native-x86-light.ads"}
return {
"light": "system-native-x86-light.ads",
"light-tasking": "system-native-x86-light-tasking.ads",
}


class Aarch64Linux(Linux):
Expand All @@ -62,4 +69,7 @@ def is_64bit(self):

@property
def system_ads(self):
return {"light": "system-native-arm-light.ads"}
return {
"light": "system-native-arm-light.ads",
"light-tasking": "system-native-arm-light-tasking.ads",
}
44 changes: 44 additions & 0 deletions linux/adaint.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
#ifndef _GNU_SOURCE
#define _GNU_SOURCE
#endif
#include <sys/syscall.h>
#include <unistd.h>
#include <sched.h>

void *
__gnat_lwp_self (void)
{
return (void *) syscall (__NR_gettid);
}

cpu_set_t *
__gnat_cpu_alloc (size_t count)
{
return CPU_ALLOC (count);
}

size_t
__gnat_cpu_alloc_size (size_t count)
{
return CPU_ALLOC_SIZE (count);
}

void
__gnat_cpu_free (cpu_set_t *set)
{
CPU_FREE (set);
}

void
__gnat_cpu_zero (size_t count, cpu_set_t *set)
{
CPU_ZERO_S (count, set);
}

void
__gnat_cpu_set (int cpu, size_t count, cpu_set_t *set)
{
/* Ada handles CPU numbers starting from 1, while C identifies the first
CPU by a 0, so we need to adjust. */
CPU_SET_S (cpu - 1, count, set);
}
184 changes: 184 additions & 0 deletions src/system/system-native-arm-light-tasking.ads
Original file line number Diff line number Diff line change
@@ -0,0 +1,184 @@
------------------------------------------------------------------------------
-- --
-- GNAT RUN-TIME COMPONENTS --
-- --
-- S Y S T E M --
-- --
-- S p e c --
-- (x86-64 Version) --
-- --
-- Copyright (C) 1992-2023, Free Software Foundation, Inc. --
-- --
-- This specification is derived from the Ada Reference Manual for use with --
-- GNAT. The copyright notice above, and the license provisions that follow --
-- apply solely to the contents of the part following the private keyword. --
-- --
-- GNAT is free software; you can redistribute it and/or modify it under --
-- terms of the GNU General Public License as published by the Free Soft- --
-- ware Foundation; either version 3, or (at your option) any later ver- --
-- sion. GNAT is distributed in the hope that it will be useful, but WITH- --
-- OUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY --
-- or FITNESS FOR A PARTICULAR PURPOSE. --
-- --
-- As a special exception under Section 7 of GPL version 3, you are granted --
-- additional permissions described in the GCC Runtime Library Exception, --
-- version 3.1, as published by the Free Software Foundation. --
-- --
-- You should have received a copy of the GNU General Public License and --
-- a copy of the GCC Runtime Library Exception along with this program; --
-- see the files COPYING3 and COPYING.RUNTIME respectively. If not, see --
-- <http://www.gnu.org/licenses/>. --
-- --
-- GNAT was originally developed by the GNAT team at New York University. --
-- Extensive contributions were provided by Ada Core Technologies Inc. --
-- --
------------------------------------------------------------------------------

pragma Restrictions (No_Exception_Propagation);
-- Only local exception handling is supported in this profile

pragma Restrictions (No_Exception_Registration);
-- Disable exception name registration. This capability is not used because
-- it is only required by exception stream attributes which are not supported
-- in this run time.

pragma Restrictions (No_Implicit_Dynamic_Code);
-- Pointers to nested subprograms are not allowed in this run time, in order
-- to prevent the compiler from building "trampolines".

pragma Restrictions (No_Finalization);
-- Controlled types are not supported in this run time

pragma Restrictions (No_Use_Of_Pragma => Attach_Handler);
pragma Restrictions (No_Specification_Of_Aspect => Attach_Handler);
-- This pragma is not supported by the Ravenscar Cert profile

pragma Profile (Jorvik);
-- This is a bare metal tasking runtime

package System is
pragma Pure;
-- Note that we take advantage of the implementation permission to make
-- this unit Pure instead of Preelaborable; see RM 13.7.1(15). In Ada
-- 2005, this is Pure in any case (AI-362).

pragma No_Elaboration_Code_All;
-- Allow the use of that restriction in units that WITH this unit

type Name is (SYSTEM_NAME_GNAT);
System_Name : constant Name := SYSTEM_NAME_GNAT;

-- System-Dependent Named Numbers

Min_Int : constant := -2 ** (Standard'Max_Integer_Size - 1);
Max_Int : constant := 2 ** (Standard'Max_Integer_Size - 1) - 1;

Max_Binary_Modulus : constant := 2 ** Standard'Max_Integer_Size;
Max_Nonbinary_Modulus : constant := 2 ** Integer'Size - 1;

Max_Base_Digits : constant := Long_Long_Float'Digits;
Max_Digits : constant := Long_Long_Float'Digits;

Max_Mantissa : constant := Standard'Max_Integer_Size - 1;
Fine_Delta : constant := 2.0 ** (-Max_Mantissa);

Tick : constant := 0.000_001;

-- Storage-related Declarations

type Address is private;
pragma Preelaborable_Initialization (Address);
Null_Address : constant Address;

Storage_Unit : constant := 8;
Word_Size : constant := Standard'Word_Size;
Memory_Size : constant := 2 ** Word_Size;

-- Address comparison

function "<" (Left, Right : Address) return Boolean;
function "<=" (Left, Right : Address) return Boolean;
function ">" (Left, Right : Address) return Boolean;
function ">=" (Left, Right : Address) return Boolean;
function "=" (Left, Right : Address) return Boolean;

pragma Import (Intrinsic, "<");
pragma Import (Intrinsic, "<=");
pragma Import (Intrinsic, ">");
pragma Import (Intrinsic, ">=");
pragma Import (Intrinsic, "=");

-- Other System-Dependent Declarations

type Bit_Order is (High_Order_First, Low_Order_First);
Default_Bit_Order : constant Bit_Order :=
Bit_Order'Val (Standard'Default_Bit_Order);
pragma Warnings (Off, Default_Bit_Order); -- kill constant condition warning

-- Priority-related Declarations (RM D.1)

-- 0 .. 98 corresponds to the system priority range 1 .. 99.
--
-- If the scheduling policy is SCHED_FIFO or SCHED_RR the runtime makes use
-- of the entire range provided by the system.
--
-- If the scheduling policy is SCHED_OTHER the only valid system priority
-- is 1 and other values are simply ignored.

Max_Priority : constant Positive := 97;
Max_Interrupt_Priority : constant Positive := 98;

subtype Any_Priority is Integer range 0 .. 98;
subtype Priority is Any_Priority range 0 .. 97;
subtype Interrupt_Priority is Any_Priority range 98 .. 98;

Default_Priority : constant Priority := 48;
-- By default, the priority assigned is the one in the middle of the
-- Priority range.

private

type Address is mod Memory_Size;
for Address'Size use Standard'Address_Size;

Null_Address : constant Address := 0;

--------------------------------------
-- System Implementation Parameters --
--------------------------------------

-- These parameters provide information about the target that is used
-- by the compiler. They are in the private part of System, where they
-- can be accessed using the special circuitry in the Targparm unit
-- whose source should be consulted for more detailed descriptions
-- of the individual switch values.

Atomic_Sync_Default : constant Boolean := False;
Backend_Divide_Checks : constant Boolean := False;
Backend_Overflow_Checks : constant Boolean := True;
Command_Line_Args : constant Boolean := False;
Configurable_Run_Time : constant Boolean := True;
Denorm : constant Boolean := True;
Duration_32_Bits : constant Boolean := False;
Exit_Status_Supported : constant Boolean := True;
Fractional_Fixed_Ops : constant Boolean := False;
Frontend_Layout : constant Boolean := False;
Machine_Overflows : constant Boolean := False;
Machine_Rounds : constant Boolean := True;
Preallocated_Stacks : constant Boolean := False;
Signed_Zeros : constant Boolean := True;
Stack_Check_Default : constant Boolean := False;
Stack_Check_Probes : constant Boolean := False;
Stack_Check_Limits : constant Boolean := False;
Support_Aggregates : constant Boolean := True;
Support_Atomic_Primitives : constant Boolean := True;
Support_Composite_Assign : constant Boolean := True;
Support_Composite_Compare : constant Boolean := True;
Support_Long_Shifts : constant Boolean := True;
Always_Compatible_Rep : constant Boolean := True;
Suppress_Standard_Library : constant Boolean := True;
Use_Ada_Main_Program_Name : constant Boolean := False;
Frontend_Exceptions : constant Boolean := False;
ZCX_By_Default : constant Boolean := True;

end System;
1 change: 1 addition & 0 deletions src/system/system-native-arm-light.ads
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ private
Stack_Check_Probes : constant Boolean := False;
Stack_Check_Limits : constant Boolean := False;
Support_Aggregates : constant Boolean := True;
Support_Atomic_Primitives : constant Boolean := True;
Support_Composite_Assign : constant Boolean := True;
Support_Composite_Compare : constant Boolean := True;
Support_Long_Shifts : constant Boolean := True;
Expand Down
Loading

0 comments on commit aacdcf5

Please sign in to comment.