Small changes to allow the names of the variables needed by OMPD to be listed.

Small changes to allow the names of the set of variables
that the OMPD may need to satisfy requests from the debugger.
The file generated by the changes to the CMakefile is not
generated by default, and is not built into the runtime.
So there should be absolutely no performance impact at all.
What it does do is provide a convenient way to expand out
the names that the debugger will eventually be asked about.

  Changes to be committed:
    modified:   runtime/src/CMakeLists.txt
    new file:   runtime/src/ompd-symbols.c.in

Author: ariel-rw

runtime/src/CMakeLists.txt

@@ -261,6 +261,24 @@ if(${LIBOMP_FORTRAN_MODULES})
   set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES omp_lib${CMAKE_C_OUTPUT_EXTENSION})
 endif()
 
+# generate a C file containing the names of the variables that encode
+# size and offset information for OMPD.
+# This is not built into the runtime, but can be generated by invoking
+# "gmake ompd-symbols".  This will create a .c file in the build area,
+# which be examined as needed.
+libomp_get_cflags(OMPD_SYMBOLS_CFLAGS)
+get_property(ompd_symbols_inc_dirs DIRECTORY PROPERTY INCLUDE_DIRECTORIES)
+message("OMPD_SYMBOLS_INC_DIRS == ${ompd_symbols_inc_dirs}")
+foreach(d ${ompd_symbols_inc_dirs})
+  set(OMPD_SYMBOLS_CFLAGS "${OMPD_SYMBOLS_CFLAGS} -I${d}")
+endforeach()
+SEPARATE_ARGUMENTS(OMPD_SYMBOLS_CFLAGS)
+add_custom_target(
+  ompd-symbols
+  DEPENDS ${LIBOMP_SRC_DIR}/ompd-symbols.c.in
+  COMMAND ${CMAKE_C_COMPILER} -C -E -x c  ${OMPD_SYMBOLS_CFLAGS} ${LIBOMP_SRC_DIR}/ompd-symbols.c.in | ${PERL_EXECUTABLE} -p -e "'s@___NEWLINE___@\\n@g'" > ${CMAKE_CURRENT_BINARY_DIR}/ompd-symbols.c
+)
+
 # Move files to exports/ directory if requested
 if(${LIBOMP_COPY_EXPORTS})
   include(LibompExports)

runtime/src/ompd-symbols.c.in

@@ -0,0 +1,33 @@
+
+#include "ompd-specific.h"
+
+
+#if OMPD_SUPPORT
+
+const char *ompd_symbols [] = {
+
+  /* OMPD_FOREACH_ACCESS: ompd_access__##t##__##m, */
+#  define ompd_define_symbol_string(t,m) "ompd_access__" #t "__" #m ,___NEWLINE___
+OMPD_FOREACH_ACCESS(ompd_define_symbol_string)
+#  undef ompd_define_symbol_string
+
+  /* OMPD_FOREACH_ACCESS: ompd_sizeof__##t##__##m, */
+#  define ompd_define_symbol_string(t,m) "ompd_sizeof__" #t "__" #m,___NEWLINE___
+OMPD_FOREACH_ACCESS(ompd_define_symbol_string)
+#  undef ompd_define_symbol_string
+
+  /* OMPD_FOREACH_BITFIELD: ompd_bitfield__##t##__##m, */
+#  define ompd_define_symbol_string(t,m) "ompd_bitfield__" #t "__" #m,___NEWLINE___
+OMPD_FOREACH_BITFIELD(ompd_define_symbol_string)
+#  undef ompd_define_symbol_string
+
+  /* OMPD_FOREACH_SIZEOF: ompd_sizeof__##t, */
+#  define ompd_define_symbol_string(t) "ompd_sizeof__" #t,___NEWLINE___
+OMPD_FOREACH_SIZEOF(ompd_define_symbol_string)
+#  undef ompd_define_symbol_string
+
+  0
+}; /* ompd_symbols */
+
+#endif
+