From f0fa480045e178d8edb4082c0a470649371d95f5 Mon Sep 17 00:00:00 2001 From: Ahmad Nawab Date: Thu, 21 Mar 2024 09:00:45 +0000 Subject: [PATCH 1/3] CMAKE: add GLOBAL_VAR_OFFLOAD arg to loki_transform_target --- cmake/loki_transform.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cmake/loki_transform.cmake b/cmake/loki_transform.cmake index 48d63fddc..de9e51a27 100644 --- a/cmake/loki_transform.cmake +++ b/cmake/loki_transform.cmake @@ -225,7 +225,7 @@ function( loki_transform_target ) set( options NO_PLAN_SOURCEDIR COPY_UNMODIFIED CPP CPP_PLAN INLINE_MEMBERS - RESOLVE_SEQUENCE_ASSOCIATION DERIVE_ARGUMENT_ARRAY_SHAPE TRIM_VECTOR_SECTIONS + RESOLVE_SEQUENCE_ASSOCIATION DERIVE_ARGUMENT_ARRAY_SHAPE TRIM_VECTOR_SECTIONS GLOBAL_VAR_OFFLOAD ) set( single_value_args TARGET COMMAND MODE DIRECTIVE FRONTEND CONFIG PLAN ) set( multi_value_args SOURCES HEADERS DEFINITIONS ) @@ -307,6 +307,10 @@ function( loki_transform_target ) list( APPEND _TRANSFORM_OPTIONS TRIM_VECTOR_SECTIONS ) endif() + if( _PAR_T_GLOBAL_VAR_OFFLOAD ) + list( APPEND _TRANSFORM_OPTIONS GLOBAL_VAR_OFFLOAD ) + endif() + loki_transform( COMMAND ${_PAR_T_COMMAND} OUTPUT ${LOKI_SOURCES_TO_APPEND} From 73f66194492714a7aef3fd142528e501024bc93d Mon Sep 17 00:00:00 2001 From: Ahmad Nawab Date: Thu, 21 Mar 2024 09:01:19 +0000 Subject: [PATCH 2/3] CMAKE: pass preproc includes to loki_transform_target --- cmake/loki_transform.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmake/loki_transform.cmake b/cmake/loki_transform.cmake index de9e51a27..8cfebc84b 100644 --- a/cmake/loki_transform.cmake +++ b/cmake/loki_transform.cmake @@ -228,7 +228,7 @@ function( loki_transform_target ) RESOLVE_SEQUENCE_ASSOCIATION DERIVE_ARGUMENT_ARRAY_SHAPE TRIM_VECTOR_SECTIONS GLOBAL_VAR_OFFLOAD ) set( single_value_args TARGET COMMAND MODE DIRECTIVE FRONTEND CONFIG PLAN ) - set( multi_value_args SOURCES HEADERS DEFINITIONS ) + set( multi_value_args SOURCES HEADERS DEFINITIONS INCLUDES ) cmake_parse_arguments( _PAR_T "${options}" "${single_value_args}" "${multi_value_args}" ${ARGN} ) @@ -322,6 +322,7 @@ function( loki_transform_target ) SOURCES ${_PAR_T_SOURCES} HEADERS ${_PAR_T_HEADERS} DEFINITIONS ${_PAR_T_DEFINITIONS} + INCLUDES ${_PAR_T_INCLUDES} DEPENDS ${LOKI_SOURCES_TO_TRANSFORM} ${_PAR_T_HEADER} ${_PAR_T_CONFIG} ${_TRANSFORM_OPTIONS} ) From 5429ad55750dd44f1abe93db6bf100a9b3c21753 Mon Sep 17 00:00:00 2001 From: Ahmad Nawab Date: Thu, 21 Mar 2024 14:23:09 +0000 Subject: [PATCH 3/3] SCRIPTS: add idem-stack mode to plan --- scripts/loki_transform.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/loki_transform.py b/scripts/loki_transform.py index f430ea541..169a426b0 100644 --- a/scripts/loki_transform.py +++ b/scripts/loki_transform.py @@ -319,7 +319,7 @@ def transform_subroutine(self, routine, **kwargs): @cli.command('plan') @click.option('--mode', '-m', default='sca', - type=click.Choice(['idem', 'sca', 'claw', 'scc', 'scc-hoist', 'scc-stack'])) + type=click.Choice(['idem', 'idem-stack', 'sca', 'claw', 'scc', 'scc-hoist', 'scc-stack'])) @click.option('--config', '-c', type=click.Path(), help='Path to configuration file.') @click.option('--header', '-I', type=click.Path(), multiple=True,