Skip to content

Commit 04ff2ff

Browse files
hppritchahppritcha
committed
tools: first steps to add support for ABI
Turns out that the ABI standard impacts MPI_T related constants, etc. and we don't want to switch to this for our OMPI standard, so we need to add support for MPI_T_ ABI compliant functions. Additions to the binding infrastructure to support generation of ABI bindings will be introduced in a subsequent commit. Signed-off-by: Howard Pritchard <howardp@lanl.gov>
1 parent f6218c0 commit 04ff2ff

35 files changed

+306
-288
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -539,6 +539,7 @@ ompi/mpi/c/standard_*.c
539539
ompi/mpi/c/abi.h
540540
ompi/mpi/c/abi_get_info.c
541541
ompi/mpi/c/standard_abi
542+
ompi/mpi/tool/*_generated*.c
542543

543544
# Generated Fortran Bindings
544545
ompi/mpi/fortran/use-mpi-f08/*_generated.F90

‎ompi/mpi/bindings/bindings.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ def main():
6161
# parser = argparse.ArgumentParser(description='C ABI binding generation code')
6262
parser_gen.add_argument('type', choices=('ompi', 'standard'),
6363
help='generate the OMPI ABI functions or the standard ABI functions')
64+
parser_gen.add_argument('--mpit', action='store_true', help='generate MPI T code generation')
6465
parser_gen.add_argument('source_file', help='template file to use for C code generation')
6566
parser_gen.set_defaults(handler=lambda args, out: c.generate_source(args, out))
6667
args = parser.parse_args()

‎ompi/mpi/bindings/ompi_bindings/c.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,10 @@ def generate_source(args, out):
524524
"""Generate source file."""
525525
out.dump(f'/* {consts.GENERATED_MESSAGE} */')
526526
template = SourceTemplate.load(args.source_file, type_constructor=Type.construct)
527-
base_name = util.mpi_fn_name_from_base_fn_name(template.prototype.name)
527+
if args.mpit == True:
528+
base_name = util.mpit_fn_name_from_base_fn_name(template.prototype.name)
529+
else:
530+
base_name = util.mpi_fn_name_from_base_fn_name(template.prototype.name)
528531
if args.type == 'ompi':
529532
ompi_abi(base_name, template, out)
530533
else:

‎ompi/mpi/bindings/ompi_bindings/c_type.py‎

Lines changed: 174 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,19 @@ class Type(ABC):
1919
PARAMS_STANDARD_ABI = {}
2020

2121
def __init__(self, type_name, name=None,
22-
mangle_name=lambda name: abi_internal_name(name),
22+
mangle_name=lambda name: util.abi_internal_name(name),
2323
count_param=None, **kwargs):
2424
self.type = type_name
2525
self.name = name
2626
self.count_param = count_param
27-
self.mangle_name = util.abi_internal_name
27+
self.mangle_name = mangle_name
2828

2929
@staticmethod
3030
def construct(abi_type, type_name, **kwargs):
3131
"""Construct the parameter for the given ABI and type."""
3232
if abi_type == 'ompi':
3333
return Type.PARAMS_OMPI_ABI[type_name](type_name, **kwargs)
3434
elif abi_type == 'standard':
35-
# print("Checkint oug type " + str(type_name))
3635
return Type.PARAMS_STANDARD_ABI[type_name](type_name, **kwargs)
3736
else:
3837
raise RuntimeError(f'invalid ABI type {abi_type}')
@@ -82,6 +81,7 @@ def tmp_type_text(self, enable_count=False):
8281
return self.type_text(enable_count=enable_count)
8382

8483
def parameter(self, enable_count=False, **kwargs):
84+
"""Peturn the text to be used for this parameter in the prototype declaration."""
8585
return f'{self.type_text(enable_count=enable_count)} {self.name}'
8686

8787
@property
@@ -1688,3 +1688,174 @@ def return_code(self, name):
16881688
return [f'return {ConvertOMPIToStandard.SESSION}({name});']
16891689

16901690

1691+
@Type.add_type('T_ENUM', abi_type=['ompi'])
1692+
class TypeTEnum(Type):
1693+
1694+
def type_text(self, enable_count=False):
1695+
return 'MPI_T_enum'
1696+
1697+
@Type.add_type('T_ENUM_OUT', abi_type=['ompi'])
1698+
class TypeTEnumOut(Type):
1699+
1700+
def type_text(self, enable_count=False):
1701+
return 'MPI_T_enum *'
1702+
1703+
@Type.add_type('CVAR_HANDLE', abi_type=['ompi'])
1704+
class TypeCvarHandle(Type):
1705+
1706+
def type_text(self, enable_count=False):
1707+
return 'MPI_T_cvar_handle'
1708+
1709+
@Type.add_type('CVAR_HANDLE_OUT', abi_type=['ompi'])
1710+
class TypeCvarHandle(Type):
1711+
1712+
def type_text(self, enable_count=False):
1713+
return 'MPI_T_cvar_handle *'
1714+
1715+
@Type.add_type('CVAR_HANDLE_INOUT', abi_type=['ompi'])
1716+
class TypeCvarHandleInOut(Type):
1717+
1718+
def type_text(self, enable_count=False):
1719+
return 'MPI_T_cvar_handle *'
1720+
1721+
@Type.add_type('BIND', abi_type=['ompi'])
1722+
class TypeBind(Type):
1723+
1724+
def type_text(self, enable_count=False):
1725+
return 'int'
1726+
1727+
@Type.add_type('BIND_OUT', abi_type=['ompi'])
1728+
class TypeBindOut(Type):
1729+
1730+
def type_text(self, enable_count=False):
1731+
return 'int *'
1732+
1733+
@Type.add_type('EVENT_REGISTRATION', abi_type=['ompi'])
1734+
class TypeEventRegistration(Type):
1735+
1736+
def type_text(self, enable_count=False):
1737+
return 'MPI_T_event_registration'
1738+
1739+
@Type.add_type('EVENT_REGISTRATION_OUT', abi_type=['ompi'])
1740+
class TypeEventRegistrationOut(Type):
1741+
1742+
def type_text(self, enable_count=False):
1743+
return 'MPI_T_event_registration *'
1744+
1745+
@Type.add_type('PVAR_HANDLE', abi_type=['ompi'])
1746+
class TypePvarHandle(Type):
1747+
1748+
def type_text(self, enable_count=False):
1749+
return 'MPI_T_pvar_handle'
1750+
1751+
@Type.add_type('PVAR_HANDLE_OUT', abi_type=['ompi'])
1752+
class TypePvarHandleOut(Type):
1753+
1754+
def type_text(self, enable_count=False):
1755+
return 'MPI_T_pvar_handle *'
1756+
1757+
@Type.add_type('PVAR_HANDLE_INOUT', abi_type=['ompi'])
1758+
class TypePvarHandleInout(Type):
1759+
1760+
def type_text(self, enable_count=False):
1761+
return 'MPI_T_pvar_handle *'
1762+
1763+
@Type.add_type('PVAR_SESSION', abi_type=['ompi'])
1764+
class TypePvarSession(Type):
1765+
1766+
def type_text(self, enable_count=False):
1767+
return 'MPI_T_pvar_session'
1768+
1769+
@Type.add_type('PVAR_SESSION_OUT', abi_type=['ompi'])
1770+
class TypePvarSessionOut(Type):
1771+
1772+
def type_text(self, enable_count=False):
1773+
return 'MPI_T_pvar_session *'
1774+
1775+
@Type.add_type('T_VERBOSITY', abi_type=['ompi'])
1776+
class TypeTVerbosity(Type):
1777+
1778+
def type_text(self, enable_count=False):
1779+
return 'int'
1780+
1781+
@Type.add_type('T_VERBOSITY_OUT', abi_type=['ompi'])
1782+
class TypeTVerbosityOut(Type):
1783+
1784+
def type_text(self, enable_count=False):
1785+
return 'int *'
1786+
1787+
@Type.add_type('PVAR_CLASS', abi_type=['ompi'])
1788+
class TypePvarClass(Type):
1789+
1790+
def type_text(self, enable_count=False):
1791+
return 'int'
1792+
1793+
@Type.add_type('PVAR_CLASS_OUT', abi_type=['ompi'])
1794+
class TypePvarClassOut(Type):
1795+
1796+
def type_text(self, enable_count=False):
1797+
return 'int *'
1798+
1799+
@Type.add_type('CB_SAFETY', abi_type=['ompi'])
1800+
class TypeCbSafety(Type):
1801+
1802+
def type_text(self, enable_count=False):
1803+
return 'MPI_T_cb_safety'
1804+
1805+
@Type.add_type('SOURCE_ORDER', abi_type=['ompi'])
1806+
class TypeSourceOrder(Type):
1807+
1808+
def type_text(self, enable_count=False):
1809+
return 'MPI_T_source_order'
1810+
1811+
@Type.add_type('SOURCE_ORDER_OUT', abi_type=['ompi'])
1812+
class TypeSourceOrderOut(Type):
1813+
1814+
def type_text(self, enable_count=False):
1815+
return 'MPI_T_source_order *'
1816+
1817+
@Type.add_type('EVENT_FREE_CB_FUNCTION', abi_type=['ompi'])
1818+
class TypeEventFreeCBFunction(Type):
1819+
1820+
def type_text(self, enable_count=False):
1821+
return 'MPI_T_event_free_cb_function'
1822+
1823+
1824+
@Type.add_type('EVENT_DROPPED_CB_FUNCTION', abi_type=['ompi'])
1825+
class TypeEventDroppedCBFunction(Type):
1826+
1827+
def type_text(self, enable_count=False):
1828+
return 'MPI_T_event_dropped_cb_function'
1829+
1830+
@Type.add_type('EVENT_CB_FUNCTION', abi_type=['ompi'])
1831+
class TypeEventCBFunction(Type):
1832+
1833+
def type_text(self, enable_count=False):
1834+
return 'MPI_T_event_cb_function'
1835+
1836+
@Type.add_type('VOID', abi_type=['ompi'])
1837+
class TypeVoid(Type):
1838+
1839+
def type_text(self, enable_count=False):
1840+
return 'void *'
1841+
1842+
@Type.add_type('VOID', abi_type=['standard'])
1843+
class TypeVoidStandard(StandardABIType):
1844+
1845+
def type_text(self, enable_count=False):
1846+
return 'void *'
1847+
1848+
@Type.add_type('VOID_CONST', abi_type=['ompi'])
1849+
class TypeVoidConst(Type):
1850+
1851+
def type_text(self, enable_count=False):
1852+
return 'const void *'
1853+
1854+
@Type.add_type('VOID_CONST', abi_type=['standard'])
1855+
class TypeVoidConst(StandardABIType):
1856+
1857+
def type_text(self, enable_count=False):
1858+
return 'const void *'
1859+
1860+
1861+

‎ompi/mpi/bindings/ompi_bindings/util.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,9 @@ def mpi_fn_name_from_base_fn_name(name):
133133
"""Convert from a base name to the standard 'MPI_*' name."""
134134
return f'MPI_{name.capitalize()}'
135135

136+
def mpit_fn_name_from_base_fn_name(name):
137+
"""Convert from a base name to the standard 'MPI_T_*' name."""
138+
return f'MPI_T_{name}'
136139

137140
def abi_internal_name(extname):
138141
"""Convert from the ABI external name to an internal name.

‎ompi/mpi/c/Makefile.am‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -572,13 +572,13 @@ standard_abi/mpi.h: $(top_srcdir)/docs/mpi-standard-apis.json $(top_srcdir)/ompi
572572
--input $(top_srcdir)/ompi/mpi/c/abi.h.in \
573573
--abi-json $(top_srcdir)/docs/mpi-standard-abi.json \
574574
--pympistd $(top_srcdir)/3rd-party/pympistandard \
575-
--output $(top_srcdir)/ompi/mpi/c/standard_abi/mpi.h
575+
--output $@
576576

577577
# Mangled version
578578
abi.h: $(top_srcdir)/docs/mpi-standard-apis.json $(top_srcdir)/ompi/mpi/bindings/c_header.py
579579
$(OMPI_V_GEN) $(PYTHON) $(top_srcdir)/ompi/mpi/bindings/c_header.py \
580580
--input $(top_srcdir)/ompi/mpi/c/abi.h.in \
581-
--output $(top_srcdir)/ompi/mpi/c/abi.h \
581+
--output $@ \
582582
--abi-json $(top_srcdir)/docs/mpi-standard-abi.json \
583583
--pympistd-dir $(top_srcdir)/3rd-party/pympistandard \
584584
--mangle-names

‎ompi/mpi/tool/Makefile.am‎

Lines changed: 64 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
# layer, if weak symbols can't be used to alias the MPI_ namespace
2626
# into the PMPI_ namespace.
2727

28+
include $(top_srcdir)/Makefile.ompi-rules
29+
2830
noinst_LTLIBRARIES = libmpi_mpit.la libmpi_mpit_profile.la
2931
if BUILD_MPI_BINDINGS_LAYER
3032
noinst_LTLIBRARIES += libmpi_mpit_noprofile.la
@@ -50,7 +52,47 @@ endif
5052
#
5153
# List of all C files that have profile versions
5254
#
53-
interface_profile_sources = \
55+
56+
#
57+
# the following must be processed by binding framework
58+
# to generated both ompi and standard abi variants
59+
#
60+
prototype_sources = \
61+
cvar_get_info.c.in \
62+
cvar_handle_alloc.c.in \
63+
cvar_handle_free.c.in \
64+
cvar_read.c.in \
65+
cvar_write.c.in \
66+
enum_get_info.c.in \
67+
enum_get_item.c.in \
68+
event_callback_get_info.c.in \
69+
event_callback_set_info.c.in \
70+
event_handle_get_info.c.in \
71+
event_handle_set_info.c.in \
72+
event_get_info.c.in \
73+
event_handle_alloc.c.in \
74+
event_handle_free.c.in \
75+
event_register_callback.c.in \
76+
event_set_dropped_handler.c.in \
77+
pvar_get_info.c.in \
78+
pvar_handle_alloc.c.in \
79+
pvar_handle_free.c.in \
80+
pvar_read.c.in \
81+
pvar_readreset.c.in \
82+
pvar_reset.c.in \
83+
pvar_session_create.c.in \
84+
pvar_session_free.c.in \
85+
pvar_start.c.in \
86+
pvar_stop.c.in \
87+
pvar_write.c.in \
88+
source_get_info.c.in
89+
90+
#
91+
# the following have function prototypes that work both for
92+
# ompi and standard abi so do not requiring generating by the binding
93+
# framework
94+
#
95+
interface_profile_sources_np = \
5496
category_changed.c \
5597
category_get_categories.c \
5698
category_get_cvars.c \
@@ -60,51 +102,43 @@ interface_profile_sources = \
60102
category_get_num.c \
61103
category_get_num_events.c \
62104
category_get_pvars.c \
63-
cvar_get_info.c \
64105
cvar_get_index.c \
65106
cvar_get_num.c \
66-
cvar_handle_alloc.c \
67-
cvar_handle_free.c \
68-
cvar_read.c \
69-
cvar_write.c \
70-
enum_get_info.c \
71-
enum_get_item.c \
72-
event_get_index.c \
73107
event_copy.c \
74-
event_callback_get_info.c \
75-
event_callback_set_info.c \
76-
event_handle_get_info.c \
77-
event_handle_set_info.c \
78-
event_get_info.c \
108+
event_get_index.c \
79109
event_get_num.c \
80110
event_get_source.c \
81111
event_get_timestamp.c \
82-
event_handle_alloc.c \
83-
event_handle_free.c \
84112
event_read.c \
85-
event_register_callback.c \
86-
event_set_dropped_handler.c \
87113
finalize.c \
88114
init_thread.c \
89-
pvar_get_info.c \
90115
pvar_get_index.c \
91116
pvar_get_num.c \
92-
pvar_handle_alloc.c \
93-
pvar_handle_free.c \
94-
pvar_read.c \
95-
pvar_readreset.c \
96-
pvar_reset.c \
97-
pvar_session_create.c \
98-
pvar_session_free.c \
99-
pvar_start.c \
100-
pvar_stop.c \
101-
pvar_write.c \
102117
source_get_num.c \
103-
source_get_info.c \
104118
source_get_timestamp.c
105119

120+
interface_profile_sources = $(prototype_sources:.c.in=_ompi_generated.c) \
121+
$(interface_profile_sources_np)
122+
123+
if OMPI_GENERATE_BINDINGS
124+
%_ompi_generated.c: %.c.in
125+
$(OMPI_V_GEN) $(PYTHON) $(top_srcdir)/ompi/mpi/bindings/bindings.py \
126+
--builddir $(abs_top_builddir) \
127+
--srcdir $(abs_top_srcdir) \
128+
--output $@ \
129+
c \
130+
source \
131+
ompi \
132+
--mpit \
133+
$<
134+
endif
135+
106136
libmpi_mpit_profile_la_SOURCES = $(interface_profile_sources)
107137
libmpi_mpit_profile_la_CPPFLAGS = -DOMPI_BUILD_MPI_PROFILING=1
108138

109139
libmpi_mpit_noprofile_la_SOURCES = $(interface_profile_sources)
110140
libmpi_mpit_noprofile_la_CPPFLAGS = -DOMPI_BUILD_MPI_PROFILING=0
141+
142+
EXTRA_DIST = $(prototype_sources)
143+
144+
MAINTAINERCLEANFILES = *_generated.c

0 commit comments

Comments
 (0)