Add a modified version of Intel TBB to OpenModelica (#8685)

* Add a modified version of Intel TBB to OpenModelica

  - Intel's TBB is used for handling threading functionality for the
    automatic parallelization of simulation by OpenModelica, a.k.a., _parmodauto_

  - It has been modified from its original version. The modified version
    uses the Boehm GC garbage collector of OpenModelica to perform the
    low lever thread primitive operations such as launching a new thread
    from the OS.

    This creates some complications but it is not optional. To work with
    simulation code generated by OpenModelica, any tool/library that creates
    threads has to be modified to go through the garbage collector.

* Add a C++ json reader from nlohmann/json.

  - Taken from https://github.com/nlohmann/json.

    We should proably have this as part of our 3rdParty. Or any other C++
    json parser. For now it is only needed by parmodauto.

Author: mahge

OMCompiler/3rdParty

@@ -54,6 +54,8 @@ $(builddir_man)/man1/
 CMAKE := $(CMAKE) -DCMAKE_INSTALL_MESSAGE=LAZY
 
 OMC_IPOPT_ROOT = 3rdParty/Ipopt-3.13.4
+OMC_TBB_ROOT = 3rdParty/tbb
+
 
 ifeq ("$(APP)",".app")
 	BUILD_DIRS += $(builddir_app)
@@ -214,16 +216,32 @@ opencl_rt_clean:
 	$(MAKE) -C SimulationRuntime/ParModelica/explicit/openclrt -f $(defaultMakefileTarget) clean OMBUILDDIR=$(OMBUILDDIR)
 
 
-parmodauto: boehm-gc
-ifeq ("$(ENABLE_PARMODAUTO)","yes")
-	$(MAKE) -C $(OMC_TBB_ROOT)/build_cmake/ install_for_omc
+tbb: boehm-gc
+	mkdir -p $(OMC_TBB_ROOT)/build_cmake
+	cd $(OMC_TBB_ROOT)/build_cmake && $(CMAKE) .. \
+		-G $(CMAKE_TARGET) \
+		-DCMAKE_VERBOSE_MAKEFILE=ON \
+		-DCMAKE_INSTALL_PREFIX="$(top_builddir)" \
+		-DCMAKE_INSTALL_LIBDIR="$(builddir_lib_omc)" \
+		-DCMAKE_INSTALL_INCLUDEDIR="$(builddir_inc)" \
+		-DCMAKE_INSTALL_DATAROOTDIR="$(builddir_share)" \
+		-DTBB_BUILD_TESTS=OFF \
+		-DTBB_BUILD_SHARED=OFF \
+		-DTBB_BUILD_TBBMALLOC=OFF \
+		-DTBB_BUILD_TBBMALLOC_PROXY=OFF \
+		-DCMAKE_POSITION_INDEPENDENT_CODE=ON
+	$(MAKE) -C $(OMC_TBB_ROOT)/build_cmake install
+
+tbb_clean:
+	if test -f $(OMC_TBB_ROOT)/build_cmake/Makefile; then $(MAKE) -C $(OMC_TBB_ROOT)/build_cmake/ clean; fi
+	rm -rf $(OMC_TBB_ROOT)/build_cmake
+
+parmodauto: tbb
 	$(MAKE) -C SimulationRuntime/ParModelica/auto/ -f $(defaultMakefileTarget) OMBUILDDIR=$(OMBUILDDIR)
-endif
 
-parmodauto_clean:
+parmodauto_clean: tbb_clean
 	$(MAKE) -C SimulationRuntime/ParModelica/auto/ -f $(defaultMakefileTarget) clean OMBUILDDIR=$(OMBUILDDIR)
 
-
 breakprocess:
 	(cd tools/debugging/ && time g++ BreakProcess.cpp -o BreakProcess -static-libgcc)
 	(cd tools/debugging/ && cp BreakProcess.exe $(builddir_bin))

OMCompiler/Makefile.common

@@ -29,9 +29,6 @@ CMAKE_RPATH := CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)"
 CMAKE_TARGET = "Unix Makefiles"
 OPENCL = @OPENCL@
 
-ENABLE_PARMODAUTO = @ENABLE_PARMODAUTO@
-OMC_TBB_ROOT = @OMC_TBB_ROOT@
-
 defaultMakefileTarget = Makefile
 MAKEFILE_BOOT = LinkMain.makefile
 QMAKE=@QMAKE@

OMCompiler/Makefile.in

@@ -10,7 +10,7 @@ endif()
 omc_add_subdirectory(ModelicaExternalC)
 
 # omc_add_subdirectory(opc)
-# omc_add_subdirectory(ParModelica)
+omc_add_subdirectory(ParModelica)
 #ADD_SUBDIRECTORY(cpp)
 #ADD_SUBDIRECTORY(interactive)
 

OMCompiler/SimulationRuntime/CMakeLists.txt

@@ -1,4 +1,5 @@
 
+set(CMAKE_INSTALL_INCLUDEDIR ${CMAKE_INSTALL_INCLUDEDIR}/ParModelica)
 omc_add_subdirectory(auto)
 
 

OMCompiler/SimulationRuntime/ParModelica/CMakeLists.txt

@@ -1,6 +1,7 @@
 cmake_minimum_required(VERSION 3.14)
 
 project(ParModelicaAuto)
+set(CMAKE_INSTALL_INCLUDEDIR ${CMAKE_INSTALL_INCLUDEDIR}/auto)
 
 find_package(Boost REQUIRED COMPONENTS graph chrono)
 
@@ -19,6 +20,11 @@ target_link_libraries(ParModelicaAuto PUBLIC omc::simrt::runtime)
 target_link_libraries(ParModelicaAuto PUBLIC omc::3rd::tbb)
 target_compile_definitions(ParModelicaAuto PRIVATE USE_FLOW_SCHEDULER)
 
-add_executable(ParModelicaAutoTest)
-target_sources(ParModelicaAutoTest PRIVATE test_task_graph.cpp)
-target_link_libraries(ParModelicaAutoTest ParModelicaAuto ParModelicaAuto)
+# add_executable(ParModelicaAutoTest)
+# target_sources(ParModelicaAutoTest PRIVATE test_task_graph.cpp)
+# target_link_libraries(ParModelicaAutoTest PRIVATE ParModelicaAuto)
+
+
+install(TARGETS ParModelicaAuto)
+install(FILES om_pm_interface.hpp
+        TYPE INCLUDE)

OMCompiler/SimulationRuntime/ParModelica/auto/CMakeLists.txt

@@ -7,8 +7,7 @@ OPENMODELICA_LIB=$(TOP_BUILDDIR)/lib/@host_short@/omc
 OPENMODELICA_BIN=$(TOP_BUILDDIR)/bin/
 
 BOOST_HOME = @BOOSTHOME@
-OMC_TBB_ROOT = @OMC_TBB_ROOT@
-INCDIRS = -I"../../c" -I$(BOOST_HOME) -I$(OMC_TBB_ROOT)/include -I$(OMCOMPILER_ROOT)/3rdParty/gc/include
+INCDIRS = -I"../../c" -I$(BOOST_HOME) -I$(OMCOMPILER_ROOT)/3rdParty/tbb/include -I$(OMCOMPILER_ROOT)/3rdParty/gc/include
 
 CC=@CC@
 CXX=@CXX@
@@ -20,9 +19,9 @@ OS_SRCS = pm_posix_timer.cpp
 EXEEXT=
 DLLEXT=.so
 
-all: transfer
+all: install
 
-transfer: libParModelicaAuto.a
+install: libParModelicaAuto.a
 	$(COPY) libParModelicaAuto.a $(OPENMODELICA_LIB)
 	mkdir -p $(PARMODELICAAUTO_INC)
 	$(COPY) om_pm_interface.hpp $(PARMODELICAAUTO_INC)

OMCompiler/SimulationRuntime/ParModelica/auto/Makefile.in

@@ -6,9 +6,8 @@ PARMODELICAAUTO_INC=$(OPENMODELICA_INC)/ParModelica/auto/
 OPENMODELICA_LIB=$(TOP_BUILDDIR)/lib/omc/
 OPENMODELICA_BIN=$(TOP_BUILDDIR)/bin/
 
-OMC_TBB_ROOT = $(OMCOMPILER_ROOT)/3rdParty/tbb/
 BOOST_HOME = $(OMDEV)/lib/3rdParty/boost-1_49
-INCDIRS = -I"../../c" -I$(BOOST_HOME) -I$(OMC_TBB_ROOT)/include -I$(OMCOMPILER_ROOT)/3rdParty/gc/include
+INCDIRS = -I"../../c" -I$(BOOST_HOME) -I$(OMCOMPILER_ROOT)/3rdParty/tbb/include -I$(OMCOMPILER_ROOT)/3rdParty/gc/include
 
 CC=gcc
 CXX=g++
@@ -20,13 +19,13 @@ OS_SRCS = pm_win_timer.cpp
 EXEEXT=.exe
 DLLEXT=.dll
 
-all: transfer
+all: install
 
-transfer: libParModelicaAuto.a
+install: libParModelicaAuto.a
 	$(COPY) libParModelicaAuto.a $(OPENMODELICA_LIB)
 	mkdir -p $(PARMODELICAAUTO_INC)
 	$(COPY) om_pm_interface.hpp $(PARMODELICAAUTO_INC)
-    
+
 include Makefile.common