residual instances of iomp

Jonathan,
     While current openmp at r238715 bootstraps and the resulting
build shows no regressions in OpenMP3.1_Validation you might want to
double check the following instances of 'iomp' in the files...

offload/Makefile:# libiomp_host_dir - path to host libiomp directory
(unnecessary if compiler_host is icc)
offload/Makefile:# libiomp_target_dir - path to target libiomp
directory (unnecesarry if compiler_target is icc)
offload/Makefile:opts_liboffload=-shared -Wl,-soname,liboffload.so.5
-ldl -lstdc++ -liomp5
offload/Makefile:ifneq ($(libiomp_host_dir), )
offload/Makefile: opts_liboffload_host+=-L$(libiomp_host_dir)
offload/Makefile:ifneq ($(libiomp_target_dir), )
offload/Makefile: opts_liboffload_target+=-L$(libiomp_target_dir)
offload/Makefile: @echo "libiomp_host_dir = $(libiomp_host_dir)"
offload/Makefile: @echo "libiomp_target_dir = $(libiomp_target_dir)"
offload/README.txt:libiomp_host_dir: The path to the host Intel(R)
OpenMP* Runtime Library.
offload/README.txt:libiomp_target_dir: The path to the target
Intel(R) OpenMP* Runtime
runtime/CMakeLists.txt:# iomp_lib.h : ev-flags += -D
KMP_INT_PTR_KIND="int_ptr_kind()"
runtime/Makefile:libiomp5_path=$(shell $(omp_root)/tools/check-openmp.pl)
runtime/Makefile: export LIBRARY_PATH=$(libiomp5_path):$(LIBRARY_PATH) ; \
runtime/Makefile: export
C_INCLUDE_PATH=$(libiomp5_path)$(SLASH)..$(SLASH)..$(SLASH)common$(SLASH)include:$(C_INCLUDE_PATH)
; \
runtime/Makefile: export LD_LIBRARY_PATH=$(libiomp5_path):$(LD_LIBRARY_PATH) ; \
runtime/Makefile: export
DYLD_LIBRARY_PATH=$(libiomp5_path):$(DYLD_LIBRARY_PATH) ; \
runtime/src/makefile.mk: # the build compiler's
version of libiomp5md.dll, but
runtime/src/makefile.mk: _lib_item = libiomp
runtime/src/makefile.mk:out_inc_files = $(addprefix
$(out_ptf_dir)include_compat/,iomp_lib.h)
runtime/src/makefile.mk: $(addprefix $(out_cmn_dir)include_compat/,iomp.h)
runtime/src/makefile.mk: lib_file_deps = iomp$(obj)
runtime/src/makefile.mk: # iomp.o is a big object file including
all the OMP RTL object files and object files from
runtime/src/makefile.mk: iomp$(obj) : $(lib_obj_files)
external-symbols.lst external-objects.lst .rebuild
runtime/src/makefile.mk: iomp$(obj) : $(lib_obj_files)
external-symbols.lst external-objects.lst .rebuild
runtime/src/makefile.mk: # be linked into iomp.o. kmp_dummy.o is
added to the list to avoid empty list -- OS X* utilities
runtime/src/makefile.mk:libiomp.rc : libiomp.rc.var kmp_version.c
runtime/src/makefile.mk:libiomp.rc : ev-flags += -D KMP_FILE=$(lib_file)
runtime/src/makefile.mk:$(rc_file) : libiomp.rc .rebuild
runtime/src/makefile.mk:iomp_lib.h : ev-flags += -D
KMP_INT_PTR_KIND=$(if $(filter 32,$(arch)),4,8)
testsuite/bin/header:; RUN: %clang -liomp5 -lm %s -o %t && %t 2>&1 |
FileCheck %s

Also do we still need to keep the following files in the tree now that
the library name has changed?

runtime/src/include/30/iomp.h.var
runtime/src/include/30/iomp_lib.h.var
runtime/src/include/40/iomp.h.var
runtime/src/include/40/iomp_lib.h.var
runtime/src/include/41/iomp.h.var
runtime/src/include/41/iomp_lib.h.var
runtime/src/libiomp.rc.var

        Jack

Jonathan,
       The instances of "iomp" still remain in the offload subdirectory....

offload/Makefile:# libiomp_host_dir - path to host libiomp directory
(unnecessary if compiler_host is icc)
offload/Makefile:# libiomp_target_dir - path to target libiomp
directory (unnecesarry if compiler_target is icc)
offload/Makefile:opts_liboffload=-shared -Wl,-soname,liboffload.so.5
-ldl -lstdc++ -liomp5
offload/Makefile:ifneq ($(libiomp_host_dir), )
offload/Makefile: opts_liboffload_host+=-L$(libiomp_host_dir)
offload/Makefile:ifneq ($(libiomp_target_dir), )
offload/Makefile: opts_liboffload_target+=-L$(libiomp_target_dir)
offload/Makefile: @echo "libiomp_host_dir = $(libiomp_host_dir)"
offload/Makefile: @echo "libiomp_target_dir = $(libiomp_target_dir)"
offload/README.txt:libiomp_host_dir: The path to the host Intel(R)
OpenMP* Runtime Library.
offload/README.txt:libiomp_target_dir: The path to the target
Intel(R) OpenMP* Runtime

as well as in...

runtime/src/rules.mk: cd $(out_lib_dir) ; $(cp) $(lib_file)
libiomp5md$(dll) ; $(cp) $(imp_file) libiomp5md$(lib)
runtime/src/rules.mk: cd $(out_lib_dir) ; ln -sf $(lib_file) libiomp5$(dll)

Also, shouldn't the instance's of "Intel(R)" be changed to "LLVM" for
the library description...

offload/doc/doxygen/config:PROJECT_NAME =
"Intel® Offload Runtime Library"
offload/doc/doxygen/header.tex:{\Large
Intel\textsuperscript{\textregistered} Offload Runtime Library }\\
offload/README.txt: README for Intel(R) Offload Runtime Library
offload/README.txt:Intel(R) Offload Runtime Library requires
additional software:
offload/README.txt:1) Intel(R) OpenMP* Runtime Library. You can
either download the source
offload/README.txt:2) Intel(R) COI Runtime Library and Intel(R) MYO
Runtime Library. These
offload/README.txt:How to Build the Intel(R) Offload Runtime Library
offload/README.txt:build the Intel(R) Offload Runtime Library. To see
the default settings,
offload/README.txt:libiomp_host_dir: The path to the host Intel(R)
OpenMP* Runtime Library.
runtime/Build_With_CMake.txt: [ Intel(R) Many Integrated Core Library
(Intel(R) MIC Library) ]
runtime/src/libiomp.rc.var: VALUE "FileDescription",
"Intel(R) OpenMP* Runtime Library${{ our $MESSAGE_CATALOG;
$MESSAGE_CATALOG ? " Message Catalog" : "" }}\0"
runtime/src/libiomp.rc.var: VALUE "ProductName",
"Intel(R) OpenMP* Runtime Library\0"
runtime/src/libiomp.rc.var: "Intel(R) OpenMP* ${{
our ( $MESSAGE_CATALOG, $KMP_TYPE ); $MESSAGE_CATALOG ? "Runtime
Library Message Catalog" : "$KMP_TYPE Library" }} "
runtime/src/libomp.rc.var: VALUE "FileDescription",
"Intel(R) OpenMP* Runtime Library${{ our $MESSAGE_CATALOG;
$MESSAGE_CATALOG ? " Message Catalog" : "" }}\0"
runtime/src/libomp.rc.var: VALUE "ProductName",
"Intel(R) OpenMP* Runtime Library\0"
runtime/src/libomp.rc.var: "Intel(R) OpenMP* ${{
our ( $MESSAGE_CATALOG, $KMP_TYPE ); $MESSAGE_CATALOG ? "Runtime
Library Message Catalog" : "$KMP_TYPE Library" }} "

             Jack

I'm holding off on the offload/ changes because I believe they are going to commit things soon, including changes to the Makefile. Plus, the offload subdirectory doesn't affect the LLVM autobuild.

The iomp references in runtime/src/rules.mk are something I added which creates the symlinks in the exports directory, similar to the symlinks created at install time for CMake.

Also, shouldn't the instance's of "Intel(R)" be changed to "LLVM" for the library description...

I'm not doing anything in the offload/ subdirectory for the same reasons as above. I wasn't going to change anything in libiomp.rc.var because it is going to be deleted soon.
I can change the libomp.rc.var cases.

-- Johnny

Jonathan,
     What about the files...

runtime/src/include/30/iomp.h.var
runtime/src/include/30/iomp_lib.h.var
runtime/src/include/40/iomp.h.var
runtime/src/include/40/iomp_lib.h.var
runtime/src/include/41/iomp.h.var
runtime/src/include/41/iomp_lib.h.var
runtime/src/libiomp.rc.var

Do we still need those?
        Jack

Nope, those files have been rendered unused.

-- Johnny

Aren't those files useful if you want to test a lower version of OMP support?

C,
    We already have....

runtime/src/include/30/omp.h.var
runtime/src/include/30/omp_lib.h.var
runtime/src/include/40/omp.h.var
runtime/src/include/40/omp_lib.h.var
runtime/src/include/41/omp.h.var
runtime/src/include/41/omp_lib.h.var

without the 'i' for lower versions of OMP support. Jonathan said the
copies with libiomp in the name were created to avoid filename
conflicts with libgomp's headers but are no longer needed.

http://lists.cs.uiuc.edu/pipermail/openmp-dev/2015-May/000642.html

    Jack