Avoid exporting 80-bit fp functions for architectures other than Intel.

[malharJ]

Summary

This patch is a partial fix for issue, due to functions affected by D117473.

Implementation details:
The patch essentially creates a new macro if the architecture is either
intel32 or intel64, since the generate-def.pl cannot process boolean algebra
on macros.

[jlpeyton]

Just a few comments.

openmp/runtime/src/dllexports

760–763

Should these be guarded?

820–821

Replace these two lines with #ifdef IS_IA_ARCH (and corresponding %endif)

1246–1248

Why aren't the _cpt versions guarded as well?

[malharJ]

• Added IS_IA_ARCH guard around __kmpc_atomic_float10_*_fp functions

[malharJ]

openmp/runtime/src/dllexports

820–821

I'm a little unsure if that is having the same semantics ?
If I understand correctly you have suggested this because of the comment on line 818 ?

but I see

%ifdef arch_32

on line 839 (and it is inside the ifdef)

1246–1248

I've not touched these functions as this patch is mainly a fix (for the github issue: #56349) for
functions affected by one of my earlier patches, D117473.

I can try and make a separate patch later.

[jlpeyton]

openmp/runtime/src/dllexports

820–821

I think this change is OK, or I fail to see any issue.

Just for reference,

• arch_32 = x86
• arch_32e = x64
• arch_64 = unused. It used to mean Itanium, but it is not currently possible to produce it anymore.

So having

# Both x86 and x64
%ifdef IS_IA_ARCH
... Both x86 and x64 exports
%ifdef arch_32
# Only x86 exports
%endif
...
%endif

Seems fine.

[malharJ]

• replaced %ifndef arch_64, arch_aarch64 with IS_IA_ARCH macro

[jlpeyton]

LGTM

openmp/runtime/cmake/LibompHandleFlags.cmake

function(libomp_get_fflags fflags)
   set(${fflags} ${fflags_local} PARENT_SCOPE)
 endfunction()
 
 # Perl generate-defs.pl flags (For Windows only)
 function(libomp_get_gdflags gdflags)
   set(gdflags_local)
   if(${IA32})
     set(libomp_gdflag_arch arch_32)
+    libomp_append(gdflags_local "-D IS_IA_ARCH")
   elseif(${INTEL64})
     set(libomp_gdflag_arch arch_32e)
+    libomp_append(gdflags_local "-D IS_IA_ARCH")
   else()
     set(libomp_gdflag_arch arch_${LIBOMP_ARCH})
   endif()
   libomp_append(gdflags_local "-D ${libomp_gdflag_arch}")
   libomp_append(gdflags_local "-D msvc_compat")
   libomp_append(gdflags_local "-D norm" NORMAL_LIBRARY)
   libomp_append(gdflags_local "-D prof" PROFILE_LIBRARY)
   libomp_append(gdflags_local "-D stub" STUBS_LIBRARY)
   libomp_append(gdflags_local "-D HAVE_QUAD" LIBOMP_USE_QUAD_PRECISION)
   libomp_append(gdflags_local "-D USE_DEBUGGER" LIBOMP_USE_DEBUGGER)
   if(${DEBUG_BUILD} OR ${RELWITHDEBINFO_BUILD})
     libomp_append(gdflags_local "-D KMP_DEBUG")
   endif()
   set(${gdflags} ${gdflags_local} PARENT_SCOPE)
 endfunction()

openmp/runtime/src/dllexports

#__kmpc_atomic_float8_add           # declared above #105
     __kmpc_atomic_fixed1_neqv              2073
     __kmpc_atomic_fixed2_neqv              2074
     __kmpc_atomic_fixed4_neqv              2075
     __kmpc_atomic_fixed8_neqv              2076
     __kmpc_atomic_fixed1_eqv               2077
     __kmpc_atomic_fixed2_eqv               2078
     __kmpc_atomic_fixed4_eqv               2079
     __kmpc_atomic_fixed8_eqv               2080
-
+    %ifdef IS_IA_ARCH
     __kmpc_atomic_float10_add              2081
     __kmpc_atomic_float10_sub              2082
     __kmpc_atomic_float10_mul              2083
     __kmpc_atomic_float10_div              2084
+    %endif
 
     __kmpc_atomic_cmplx4_add               2085
     __kmpc_atomic_cmplx4_sub               2086
     __kmpc_atomic_cmplx4_mul               2087
     __kmpc_atomic_cmplx4_div               2088
     __kmpc_atomic_cmplx8_add               2089
     __kmpc_atomic_cmplx8_sub               2090
     __kmpc_atomic_cmplx8_mul               2091
     __kmpc_atomic_cmplx8_div               2092
+    %ifdef IS_IA_ARCH
     __kmpc_atomic_cmplx10_add              2093
     __kmpc_atomic_cmplx10_sub              2094
     __kmpc_atomic_cmplx10_mul              2095
     __kmpc_atomic_cmplx10_div              2096
+    %endif
     %ifdef HAVE_QUAD
     __kmpc_atomic_cmplx16_add              2097
     __kmpc_atomic_cmplx16_sub              2098
     __kmpc_atomic_cmplx16_mul              2099
    #__kmpc_atomic_cmplx16_div              2000 # moved up because of mistake in number (supposed to be 2100)
 
     __kmpc_atomic_float16_add              2101
     __kmpc_atomic_float16_sub              2102
#__kmpc_atomic_cmplx16_div              2000 # moved up because of mistake in number (supposed to be 2100)
     __kmpc_atomic_float4_mul_fp            2129
     __kmpc_atomic_float4_div_fp            2130
 
     __kmpc_atomic_float8_add_fp            2131
     __kmpc_atomic_float8_sub_fp            2132
     __kmpc_atomic_float8_mul_fp            2133
     __kmpc_atomic_float8_div_fp            2134
 
+    %ifdef IS_IA_ARCH
     __kmpc_atomic_float10_add_fp           2135
     __kmpc_atomic_float10_sub_fp           2136
     __kmpc_atomic_float10_mul_fp           2137
     __kmpc_atomic_float10_div_fp           2138
     %endif
+    %endif
 
     __kmpc_atomic_fixed1_mul_float8        2169
     __kmpc_atomic_fixed1_div_float8        2170
 
     __kmpc_atomic_fixed2_mul_float8        2174
     __kmpc_atomic_fixed2_div_float8        2175
 
     __kmpc_atomic_fixed4_mul_float8        2179
#__kmpc_atomic_cmplx16_div              2000 # moved up because of mistake in number (supposed to be 2100)
     __kmpc_atomic_cmplx4_sub_cmplx8        2232
     __kmpc_atomic_cmplx4_mul_cmplx8        2233
     __kmpc_atomic_cmplx4_div_cmplx8        2234
 
     __kmpc_atomic_1                        2247
     __kmpc_atomic_2                        2248
    #__kmpc_atomic_4                    # declared above #100
    #__kmpc_atomic_8                    # declared above #101
+    %ifdef IS_IA_ARCH
     __kmpc_atomic_10                       2251
+    %endif
     __kmpc_atomic_16                       2252
+    %ifdef IS_IA_ARCH
     __kmpc_atomic_20                       2253
+    %endif
     __kmpc_atomic_32                       2254
 
     %ifdef arch_32
 
         %ifdef HAVE_QUAD
         __kmpc_atomic_float16_add_a16      2255
         __kmpc_atomic_float16_sub_a16      2256
         __kmpc_atomic_float16_mul_a16      2257
         __kmpc_atomic_float16_div_a16      2258
         __kmpc_atomic_float16_max_a16      2259
         __kmpc_atomic_float16_min_a16      2260
 
         __kmpc_atomic_cmplx16_add_a16      2261
         __kmpc_atomic_cmplx16_sub_a16      2262
         __kmpc_atomic_cmplx16_mul_a16      2263
         __kmpc_atomic_cmplx16_div_a16      2264
         %endif
 
     %endif
 
     # These are specific to x86 and x64
-    %ifndef arch_64
-    %ifndef arch_aarch64
+    %ifdef IS_IA_ARCH
 
         # ATOMIC extensions for OpenMP 3.1 spec (x86 and x64 only)
 
         __kmpc_atomic_fixed1_rd                2265
         __kmpc_atomic_fixed2_rd                2266
         __kmpc_atomic_fixed4_rd                2267
         __kmpc_atomic_fixed8_rd                2268
         __kmpc_atomic_float4_rd                2269
%ifdef IS_IA_ARCH
             __kmpc_atomic_float4_sub_cpt_rev_fp
             __kmpc_atomic_float4_div_cpt_rev_fp
             __kmpc_atomic_float8_sub_cpt_rev_fp
             __kmpc_atomic_float8_div_cpt_rev_fp
             __kmpc_atomic_float10_sub_cpt_rev_fp
             __kmpc_atomic_float10_div_cpt_rev_fp
             %endif
 
-    %endif   # arch_aarch64
-    %endif   # arch_64
+    %endif   # IS_IA_ARCH
 
     %ifdef HAVE_QUAD
     __kmpc_atomic_fixed1u_add_fp
     __kmpc_atomic_fixed1u_sub_fp
     __kmpc_atomic_fixed1u_mul_fp
     __kmpc_atomic_fixed2u_add_fp
     __kmpc_atomic_fixed2u_sub_fp
     __kmpc_atomic_fixed2u_mul_fp
     __kmpc_atomic_fixed4u_add_fp
     __kmpc_atomic_fixed4u_sub_fp
     __kmpc_atomic_fixed4u_mul_fp
     __kmpc_atomic_fixed8u_add_fp
     __kmpc_atomic_fixed8u_sub_fp
     __kmpc_atomic_fixed8u_mul_fp
     %endif
 
     # OpenMP 5.1 atomics
+    %ifdef IS_IA_ARCH
     __kmpc_atomic_float10_max              2139
     __kmpc_atomic_float10_min              2140
+    %endif
     __kmpc_atomic_float10_max_cpt          2141
     __kmpc_atomic_float10_min_cpt          2142
 
     __kmpc_atomic_bool_1_cas               2143
     __kmpc_atomic_bool_2_cas               2144
     __kmpc_atomic_bool_4_cas               2145
     __kmpc_atomic_bool_8_cas               2146
     __kmpc_atomic_val_1_cas                2147
     __kmpc_atomic_val_2_cas                2148
     __kmpc_atomic_val_4_cas                2149