From 4cc60ba76369f910638076ba1195ae1bf5b4f8ee Mon Sep 17 00:00:00 2001 From: "David M. Ozog" Date: Thu, 6 Feb 2020 15:06:23 -0600 Subject: [PATCH] Deprecate short-typed wait/test & update tables to std AMO --- content/backmatter.tex | 19 +++++++++++++++++++ content/p2p_sync_intro.tex | 6 ++++-- content/shmem_test.tex | 4 ++-- content/shmem_test_all.tex | 4 ++-- content/shmem_test_all_vector.tex | 4 ++-- content/shmem_test_any.tex | 4 ++-- content/shmem_test_any_vector.tex | 4 ++-- content/shmem_test_some.tex | 4 ++-- content/shmem_test_some_vector.tex | 4 ++-- content/shmem_wait_until.tex | 4 ++-- content/shmem_wait_until_all.tex | 4 ++-- content/shmem_wait_until_all_vector.tex | 4 ++-- content/shmem_wait_until_any.tex | 4 ++-- content/shmem_wait_until_any_vector.tex | 4 ++-- content/shmem_wait_until_some.tex | 4 ++-- content/shmem_wait_until_some_vector.tex | 4 ++-- 16 files changed, 51 insertions(+), 30 deletions(-) diff --git a/content/backmatter.tex b/content/backmatter.tex index a67acc6f0..f6989c243 100644 --- a/content/backmatter.tex +++ b/content/backmatter.tex @@ -345,6 +345,18 @@ \section{Overview}\label{subsec:dep_overview} \hyperref[subsec:shmem_alltoall]{\FUNC{shmem\_alltoall}} \\ \hline \CorCpp: \FuncRef{shmem\_alltoalls[32,64]} & 1.5 & Current & \hyperref[subsec:shmem_alltoalls]{\FUNC{shmem\_alltoalls}} \\ \hline + \minitab{\Cstd[11]: \FuncRef{shmem\_wait\_until(\CTYPE{short} ...)} + \\ \CorCpp: \FuncRef{shmem\_short\_wait\_until}} + & 1.5 & Current & (none) \\ \hline + \minitab{\Cstd[11]: \FuncRef{shmem\_wait\_until(\CTYPE{unsigned short} ...)} + \\ \CorCpp: \FuncRef{shmem\_ushort\_wait\_until}} + & 1.5 & Current & (none) \\ \hline + \minitab{\Cstd[11]: \FuncRef{shmem\_test(\CTYPE{short} ...)} + \\ \CorCpp: \FuncRef{shmem\_short\_test}} + & 1.5 & Current & (none) \\ \hline + \minitab{\Cstd[11]: \FuncRef{shmem\_test(\CTYPE{unsigned short} ...)} + \\ \CorCpp: \FuncRef{shmem\_ushort\_test}} + & 1.5 & Current & (none) \\ \hline \end{longtable} \end{center} @@ -454,6 +466,13 @@ \subsection{\CorCpp: \FUNC{shmem\_wait\_until}} in favor of the \Cstd[11] type-generic interface of the same name or the explicitly typed \CorCpp routine \FUNC{shmem\_long\_wait\_until}. +\subsection{\textit{C11} and \CorCpp: \FUNC{shmem\_wait\_until} and \FUNC{shmem\_test} --- \CTYPE{short} and \CTYPE{unsigned short} variants} +The \CTYPE{short} and \CTYPE{unsigned short} type \CorCpp and \textit{C11} +routines for \FUNC{shmem\_wait\_until} and \FUNC{shmem\_test} were deprecated +because point-to-point synchronization routines are only compatible with +\acp{AMO} (as of \openshmem 1.5), and there is no corresponding AMO for +\CTYPE{short} and \CTYPE{unsigned short}. + \subsection{\textit{C11} and \CorCpp: \FUNC{shmem\_fetch}, \FUNC{shmem\_set}, %% Issue #66. \FUNC{shmem\_cswap}, \FUNC{shmem\_swap}, \FUNC{shmem\_finc}, \FUNC{shmem\_inc}, \FUNC{shmem\_fadd}, \FUNC{shmem\_add}} diff --git a/content/p2p_sync_intro.tex b/content/p2p_sync_intro.tex index f2132e0bc..a162d6476 100644 --- a/content/p2p_sync_intro.tex +++ b/content/p2p_sync_intro.tex @@ -9,8 +9,8 @@ Where appropriate compiler support is available, \openshmem provides type-generic point-to-point synchronization interfaces via \Cstd[11] generic selection. Such type-generic routines are supported for the -``point-to-point synchronization types'' identified in -Table~\ref{p2psynctypes}. +``standard AMO types'' identified in +Table~\ref{stdamotypes}. The point-to-point synchronization types include some of the exact-width integer types defined in \HEADER{stdint.h} by \Cstd[99]~\S7.18.1.1 and @@ -22,6 +22,7 @@ \Cstd[99]~\S7.18.3 and \Cstd[11]~\S7.20.3. \begin{table}[h] +\begin{DeprecateBlock} \begin{center} \begin{tabular}{|l|l|} \hline @@ -44,6 +45,7 @@ \TableCaptionRef{Point-to-Point Synchronization Types and Names} \label{p2psynctypes} \end{center} +\end{DeprecateBlock} \end{table} The point-to-point synchronization interface provides named constants whose diff --git a/content/shmem_test.tex b/content/shmem_test.tex index a469ec297..5ad1669a3 100644 --- a/content/shmem_test.tex +++ b/content/shmem_test.tex @@ -8,13 +8,13 @@ int @\FuncDecl{shmem\_test}@(TYPE *ivar, int cmp, TYPE cmp_value); \end{C11synopsis} where \TYPE{} is one of the point-to-point synchronization types specified by -Table \ref{p2psynctypes}. +Table \ref{stdamotypes}. \begin{Csynopsis} int @\FuncDecl{shmem\_\FuncParam{TYPENAME}\_test}@(TYPE *ivar, int cmp, TYPE cmp_value); \end{Csynopsis} where \TYPE{} is one of the point-to-point synchronization types and has a -corresponding \TYPENAME{} specified by Table \ref{p2psynctypes}. +corresponding \TYPENAME{} specified by Table \ref{stdamotypes}. \begin{apiarguments} diff --git a/content/shmem_test_all.tex b/content/shmem_test_all.tex index 16693ccb6..a0efbaaba 100644 --- a/content/shmem_test_all.tex +++ b/content/shmem_test_all.tex @@ -8,14 +8,14 @@ int @\FuncDecl{shmem\_test\_all}@(TYPE *ivars, size_t nelems, const int *status, int cmp, TYPE cmp_value); \end{C11synopsis} where \TYPE{} is one of the point-to-point synchronization types specified by -Table \ref{p2psynctypes}. +Table \ref{stdamotypes}. \begin{Csynopsis} int @\FuncDecl{shmem\_\FuncParam{TYPENAME}\_test\_all}@(TYPE *ivars, size_t nelems, const int *status, int cmp, TYPE cmp_value); \end{Csynopsis} where \TYPE{} is one of the point-to-point synchronization types and has a -corresponding \TYPENAME{} specified by Table \ref{p2psynctypes}. +corresponding \TYPENAME{} specified by Table \ref{stdamotypes}. \begin{apiarguments} diff --git a/content/shmem_test_all_vector.tex b/content/shmem_test_all_vector.tex index 698a9f2d4..e22738c0f 100644 --- a/content/shmem_test_all_vector.tex +++ b/content/shmem_test_all_vector.tex @@ -10,14 +10,14 @@ TYPE *cmp_values); \end{C11synopsis} where \TYPE{} is one of the point-to-point synchronization types specified by -Table \ref{p2psynctypes}. +Table \ref{stdamotypes}. \begin{Csynopsis} int @\FuncDecl{shmem\_\FuncParam{TYPENAME}\_test\_all\_vector}@(TYPE *ivars, size_t nelems, const int *status, int cmp, TYPE *cmp_values); \end{Csynopsis} where \TYPE{} is one of the point-to-point synchronization types and has a -corresponding \TYPENAME{} specified by Table \ref{p2psynctypes}. +corresponding \TYPENAME{} specified by Table \ref{stdamotypes}. \begin{apiarguments} diff --git a/content/shmem_test_any.tex b/content/shmem_test_any.tex index ab43b7c27..ce6cf03ed 100644 --- a/content/shmem_test_any.tex +++ b/content/shmem_test_any.tex @@ -9,14 +9,14 @@ TYPE cmp_value); \end{C11synopsis} where \TYPE{} is one of the point-to-point synchronization types specified by -Table \ref{p2psynctypes}. +Table \ref{stdamotypes}. \begin{Csynopsis} size_t @\FuncDecl{shmem\_\FuncParam{TYPENAME}\_test\_any}@(TYPE *ivars, size_t nelems, const int *status, int cmp, TYPE cmp_value); \end{Csynopsis} where \TYPE{} is one of the point-to-point synchronization types and has a -corresponding \TYPENAME{} specified by Table \ref{p2psynctypes}. +corresponding \TYPENAME{} specified by Table \ref{stdamotypes}. \begin{apiarguments} diff --git a/content/shmem_test_any_vector.tex b/content/shmem_test_any_vector.tex index 97e132873..2197bc1b7 100644 --- a/content/shmem_test_any_vector.tex +++ b/content/shmem_test_any_vector.tex @@ -10,14 +10,14 @@ TYPE *cmp_values); \end{C11synopsis} where \TYPE{} is one of the point-to-point synchronization types specified by -Table \ref{p2psynctypes}. +Table \ref{stdamotypes}. \begin{Csynopsis} size_t @\FuncDecl{shmem\_\FuncParam{TYPENAME}\_test\_any\_vector}@(TYPE *ivars, size_t nelems, const int *status, int cmp, TYPE *cmp_values); \end{Csynopsis} where \TYPE{} is one of the point-to-point synchronization types and has a -corresponding \TYPENAME{} specified by Table \ref{p2psynctypes}. +corresponding \TYPENAME{} specified by Table \ref{stdamotypes}. \begin{apiarguments} diff --git a/content/shmem_test_some.tex b/content/shmem_test_some.tex index 6bcf46375..f2547b196 100644 --- a/content/shmem_test_some.tex +++ b/content/shmem_test_some.tex @@ -9,14 +9,14 @@ int cmp, TYPE cmp_value); \end{C11synopsis} where \TYPE{} is one of the point-to-point synchronization types specified by -Table \ref{p2psynctypes}. +Table \ref{stdamotypes}. \begin{Csynopsis} size_t @\FuncDecl{shmem\_\FuncParam{TYPENAME}\_test\_some}@(TYPE *ivars, size_t nelems, size_t *indices, const int *status, int cmp, TYPE cmp_value); \end{Csynopsis} where \TYPE{} is one of the point-to-point synchronization types and has a -corresponding \TYPENAME{} specified by Table \ref{p2psynctypes}. +corresponding \TYPENAME{} specified by Table \ref{stdamotypes}. \begin{apiarguments} diff --git a/content/shmem_test_some_vector.tex b/content/shmem_test_some_vector.tex index fdc307d02..be79c57e6 100644 --- a/content/shmem_test_some_vector.tex +++ b/content/shmem_test_some_vector.tex @@ -10,14 +10,14 @@ int cmp, TYPE *cmp_values); \end{C11synopsis} where \TYPE{} is one of the point-to-point synchronization types specified by -Table \ref{p2psynctypes}. +Table \ref{stdamotypes}. \begin{Csynopsis} size_t @\FuncDecl{shmem\_\FuncParam{TYPENAME}\_test\_some\_vector}@(TYPE *ivars, size_t nelems, size_t *indices, const int *status, int cmp, TYPE *cmp_values); \end{Csynopsis} where \TYPE{} is one of the point-to-point synchronization types and has a -corresponding \TYPENAME{} specified by Table \ref{p2psynctypes}. +corresponding \TYPENAME{} specified by Table \ref{stdamotypes}. \begin{apiarguments} diff --git a/content/shmem_wait_until.tex b/content/shmem_wait_until.tex index 7e5279545..9a8bac0e7 100644 --- a/content/shmem_wait_until.tex +++ b/content/shmem_wait_until.tex @@ -8,13 +8,13 @@ void @\FuncDecl{shmem\_wait\_until}@(TYPE *ivar, int cmp, TYPE cmp_value); \end{C11synopsis} where \TYPE{} is one of the point-to-point synchronization types specified by -Table \ref{p2psynctypes}. +Table \ref{stdamotypes}. \begin{Csynopsis} void @\FuncDecl{shmem\_\FuncParam{TYPENAME}\_wait\_until}@(TYPE *ivar, int cmp, TYPE cmp_value); \end{Csynopsis} where \TYPE{} is one of the point-to-point synchronization types and has a -corresponding \TYPENAME{} specified by Table~\ref{p2psynctypes}. +corresponding \TYPENAME{} specified by Table~\ref{stdamotypes}. \begin{DeprecateBlock} \begin{CsynopsisCol} diff --git a/content/shmem_wait_until_all.tex b/content/shmem_wait_until_all.tex index a91c9232e..d6beda408 100644 --- a/content/shmem_wait_until_all.tex +++ b/content/shmem_wait_until_all.tex @@ -9,13 +9,13 @@ TYPE cmp_value); \end{C11synopsis} where \TYPE{} is one of the point-to-point synchronization types specified by -Table \ref{p2psynctypes}. +Table \ref{stdamotypes}. \begin{Csynopsis} void @\FuncDecl{shmem\_\FuncParam{TYPENAME}\_wait\_until\_all}@(TYPE *ivars, size_t nelems, const int *status, int cmp, TYPE cmp_value); \end{Csynopsis} where \TYPE{} is one of the point-to-point synchronization types and has a -corresponding \TYPENAME{} specified by Table~\ref{p2psynctypes}. +corresponding \TYPENAME{} specified by Table~\ref{stdamotypes}. \begin{apiarguments} diff --git a/content/shmem_wait_until_all_vector.tex b/content/shmem_wait_until_all_vector.tex index c996e22b3..49131a6fe 100644 --- a/content/shmem_wait_until_all_vector.tex +++ b/content/shmem_wait_until_all_vector.tex @@ -10,13 +10,13 @@ TYPE *cmp_values); \end{C11synopsis} where \TYPE{} is one of the point-to-point synchronization types specified by -Table \ref{p2psynctypes}. +Table \ref{stdamotypes}. \begin{Csynopsis} void @\FuncDecl{shmem\_\FuncParam{TYPENAME}\_wait\_until\_all\_vector}@(TYPE *ivars, size_t nelems, const int *status, int cmp, TYPE *cmp_values); \end{Csynopsis} where \TYPE{} is one of the point-to-point synchronization types and has a -corresponding \TYPENAME{} specified by Table~\ref{p2psynctypes}. +corresponding \TYPENAME{} specified by Table~\ref{stdamotypes}. \begin{apiarguments} diff --git a/content/shmem_wait_until_any.tex b/content/shmem_wait_until_any.tex index 218def53d..99797183b 100644 --- a/content/shmem_wait_until_any.tex +++ b/content/shmem_wait_until_any.tex @@ -9,14 +9,14 @@ TYPE cmp_value); \end{C11synopsis} where \TYPE{} is one of the point-to-point synchronization types specified by -Table \ref{p2psynctypes}. +Table \ref{stdamotypes}. \begin{Csynopsis} size_t @\FuncDecl{shmem\_\FuncParam{TYPENAME}\_wait\_until\_any}@(TYPE *ivars, size_t nelems, const int *status, int cmp, TYPE cmp_value); \end{Csynopsis} where \TYPE{} is one of the point-to-point synchronization types and has a -corresponding \TYPENAME{} specified by Table~\ref{p2psynctypes}. +corresponding \TYPENAME{} specified by Table~\ref{stdamotypes}. \begin{apiarguments} diff --git a/content/shmem_wait_until_any_vector.tex b/content/shmem_wait_until_any_vector.tex index 9e17b1ce2..3c918146d 100644 --- a/content/shmem_wait_until_any_vector.tex +++ b/content/shmem_wait_until_any_vector.tex @@ -10,14 +10,14 @@ TYPE *cmp_values); \end{C11synopsis} where \TYPE{} is one of the point-to-point synchronization types specified by -Table \ref{p2psynctypes}. +Table \ref{stdamotypes}. \begin{Csynopsis} size_t @\FuncDecl{shmem\_\FuncParam{TYPENAME}\_wait\_until\_any\_vector}@(TYPE *ivars, size_t nelems, const int *status, int cmp, TYPE *cmp_values); \end{Csynopsis} where \TYPE{} is one of the point-to-point synchronization types and has a -corresponding \TYPENAME{} specified by Table~\ref{p2psynctypes}. +corresponding \TYPENAME{} specified by Table~\ref{stdamotypes}. \begin{apiarguments} diff --git a/content/shmem_wait_until_some.tex b/content/shmem_wait_until_some.tex index 1d23b71e8..881267d72 100644 --- a/content/shmem_wait_until_some.tex +++ b/content/shmem_wait_until_some.tex @@ -9,14 +9,14 @@ int cmp, TYPE cmp_value); \end{C11synopsis} where \TYPE{} is one of the point-to-point synchronization types specified by -Table \ref{p2psynctypes}. +Table \ref{stdamotypes}. \begin{Csynopsis} size_t @\FuncDecl{shmem\_\FuncParam{TYPENAME}\_wait\_until\_some}@(TYPE *ivars, size_t nelems, size_t *indices, const int *status, int cmp, TYPE cmp_value); \end{Csynopsis} where \TYPE{} is one of the point-to-point synchronization types and has a -corresponding \TYPENAME{} specified by Table~\ref{p2psynctypes}. +corresponding \TYPENAME{} specified by Table~\ref{stdamotypes}. \begin{apiarguments} diff --git a/content/shmem_wait_until_some_vector.tex b/content/shmem_wait_until_some_vector.tex index d0db474ee..3eaeea25e 100644 --- a/content/shmem_wait_until_some_vector.tex +++ b/content/shmem_wait_until_some_vector.tex @@ -10,14 +10,14 @@ const int *status, int cmp, TYPE *cmp_values); \end{C11synopsis} where \TYPE{} is one of the point-to-point synchronization types specified by -Table \ref{p2psynctypes}. +Table \ref{stdamotypes}. \begin{Csynopsis} size_t @\FuncDecl{shmem\_\FuncParam{TYPENAME}\_wait\_until\_some\_vector}@(TYPE *ivars, size_t nelems, size_t *indices, const int *status, int cmp, TYPE *cmp_values); \end{Csynopsis} where \TYPE{} is one of the point-to-point synchronization types and has a -corresponding \TYPENAME{} specified by Table~\ref{p2psynctypes}. +corresponding \TYPENAME{} specified by Table~\ref{stdamotypes}. \begin{apiarguments}