Merge branch 'main' of github.com:eth-easl/dandelionFunctionExamples into main

Author: tom-kuchler

.github/workflows/cmake-multi-platform.yml

@@ -1,6 +1,6 @@
 *.swp
 .vscode
-build
+build*
 target
 *.check_cache
 Cargo.lock

.gitignore

@@ -1,11 +1,3 @@
-[submodule "dandelionFunctionInterface"]
-	path = dandelionFunctionInterface
-	url = [email protected]:eth-easl/dandelionFunctionInterface.git
-	branch = main
-[submodule "mlibc"]
-	path = mlibc
-	url = [email protected]:eth-easl/mlibc.git
-	branch = dandelion
 [submodule "wasm-compiler/rWasm"]
 	path = wasm-compiler/rWasm
 	url = https://github.com/eth-easl/rWasm

.gitmodules

@@ -1,92 +1,111 @@
-set(CMAKE_VERSION 3.20)
+set(CMAKE_VERSION 3.23)
 cmake_minimum_required(VERSION ${CMAKE_VERSION})
 
+project(function_examples LANGUAGES C CXX ASM)
+
+include(FetchContent)
+
 # option to include libc-dependent examples
-option(USE_LIBC "Use libc" OFF)
+set(ARCHITECTURE ${CMAKE_SYSTEM_PROCESSOR} CACHE STRING "the architecture to build for")
+set(PLATFORM "debug" CACHE STRING "backend to build for")
+
+if(NOT CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE "Debug")
+endif()
+
+message(STATUS "Building ${CMAKE_BUILD_TYPE} for ${PLATFORM} on ${ARCHITECTURE}")
 
 # prevent in-source builds
 if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
   message(FATAL_ERROR "In-source build detected")
 endif()
 
-project(function_examples LANGUAGES C CXX ASM)
-
-if("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
-else()
-  message(FATAL_ERROR "Compiler not clang\n" "${CMAKE_C_COMPILER_ID}")
+if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+  set_property(CACHE CMAKE_INSTALL_PREFIX PROPERTY VALUE "${CMAKE_BINARY_DIR}/dandelion_sdk")
 endif()
 
-# prepare mlibc
-if(USE_LIBC)
-  # make cross file
-  configure_file(cross_template.txt crossfile.txt)
-  include(ExternalProject)
-  ExternalProject_Add(mlibc
-    SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../mlibc
-    CONFIGURE_COMMAND meson setup --cross-file ${CMAKE_CURRENT_BINARY_DIR}/crossfile.txt -Dprefix=<INSTALL_DIR> <BINARY_DIR> <SOURCE_DIR>
-    BUILD_COMMAND ninja -C <BINARY_DIR>
-    # Enable when working on the libc to make sure it is freshly compiled
-    # BUILD_ALWAYS TRUE
-    INSTALL_COMMAND meson install -C <BINARY_DIR> --no-rebuild --only-changed --quiet
-  )
-  ExternalProject_Get_Property(mlibc INSTALL_DIR)
-  set(MLIBC_INSTALL_DIR ${INSTALL_DIR})
-
-  add_library(dlibc OBJECT IMPORTED)
-  add_dependencies(dlibc mlibc)
-  set(MLIBC_OBJ 
-    "${MLIBC_INSTALL_DIR}/lib/crt1.o"
-    "${MLIBC_INSTALL_DIR}/lib/crti.o"
-    "${MLIBC_INSTALL_DIR}/lib/crtn.o")
-  set_target_properties(dlibc PROPERTIES IMPORTED_OBJECTS "${MLIBC_OBJ}")
-  file(MAKE_DIRECTORY "${MLIBC_INSTALL_DIR}/include")
-  target_include_directories(dlibc INTERFACE "${MLIBC_INSTALL_DIR}/include")
-  set(MLIBC_LIBS
-    "${MLIBC_INSTALL_DIR}/lib/libc.a"
-    "${MLIBC_INSTALL_DIR}/lib/libcrypt.a"
-    "${MLIBC_INSTALL_DIR}/lib/libdl.a"
-    "${MLIBC_INSTALL_DIR}/lib/libm.a"
-    "${MLIBC_INSTALL_DIR}/lib/libpthread.a"
-    "${MLIBC_INSTALL_DIR}/lib/libresolv.a"
-    "${MLIBC_INSTALL_DIR}/lib/librt.a"
-    "${MLIBC_INSTALL_DIR}/lib/libutil.a"
-    ${COMP_RTLIB}
-  )
-  target_link_libraries(dlibc INTERFACE ${RUNTIME_LIB} ${MLIBC_LIBS})
-  target_link_options(dlibc INTERFACE -nostdlib)
-endif()
+# setup build toolchain
+FetchContent_Declare(
+  dandelion_sdk
+  DOWNLOAD_COMMAND gh release download latest -R eth-easl/dandelionFunctionInterface -p "*${CMAKE_BUILD_TYPE}_${PLATFORM}_${ARCHITECTURE}.tar.gz"
+  COMMAND tar -xzf "dandelion_sdk_${CMAKE_BUILD_TYPE}_${PLATFORM}_${ARCHITECTURE}.tar.gz" -C ${CMAKE_BINARY_DIR}
+)
+FetchContent_MakeAvailable(dandelion_sdk)
+
+execute_process(
+    COMMAND ${CMAKE_C_COMPILER} -print-file-name=include
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+    OUTPUT_VARIABLE COMPILER_RUNTIME_INCLUDE
+    COMMAND_ERROR_IS_FATAL ANY
+)
 
+add_subdirectory("${CMAKE_BINARY_DIR}/dandelion_sdk" "${CMAKE_BINARY_DIR}/dandelion_sdk_build")
+
+if(CMAKE_BUILD_TYPE MATCHES "Debug")
+    add_compile_options(-gdwarf-4)
+endif()
 
 # cheri compile flags
-if("${DANDELION_PLATFORM}" STREQUAL "cheri")
+if("${PLATFORM}" STREQUAL "cheri")
   add_compile_options(-march=morello -mabi=aapcs)
   add_link_options(-march=morello -mabi=aapcs -fuse-ld=lld -Xlinker --image-base=0x10000)
   get_property(CROSS_COMPILE_OPTIONS DIRECTORY PROPERTY COMPILE_OPTIONS)
   string(REPLACE ";" " " CROSS_COMPILE_OPTIONS "${CROSS_COMPILE_OPTIONS}")
   get_property(CROSS_LINK_OPTIONS DIRECTORY PROPERTY LINK_OPTIONS)
   string(REPLACE ";" " " CROSS_LINK_OPTIONS "${CROSS_LINK_OPTIONS}")
 # WebAssembly flags
-elseif("${DANDELION_PLATFORM}" STREQUAL "wasm")
+elseif("${PLATFORM}" STREQUAL "wasm")
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --verbose -target wasm32-unknown-unknown -Wl,--export-all -Wl,--import-undefined -Wl,--import-memory")
 else()
 # currently still want to set the base image lower for all other images, if some don't want make special case
   add_link_options(-fuse-ld=lld -Xlinker --image-base=0x10000)
 endif()
 
-add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/../dandelionFunctionInterface" functionInterface)
-
 # add folders with function examples
 # add_subdirectory(access)
 add_subdirectory(basic)
 add_subdirectory(busy)
 add_subdirectory(matmac)
 add_subdirectory(matmul)
 add_subdirectory(example_app_nolibc)
+
 # dependent on dlibc
-if(USE_LIBC)
-  # add_subdirectory(image_processing)
-  add_subdirectory(dirigent_busy)
-  add_subdirectory(example_app)
-  add_subdirectory(files)
-  add_subdirectory(stdio)
-endif()
+add_subdirectory(dirigent_busy)
+add_subdirectory(example_app)
+add_subdirectory(files)
+add_subdirectory(stdio)
+add_subdirectory(stdio_cxx)
+# add_subdirectory(example_app_hybrid)
+add_subdirectory(compression)
+add_subdirectory(busy_libc)
+add_subdirectory(busy_hybrid)
+
+# set(CONFIG_FLAG "--config ${CMAKE_BINARY_DIR}/dandelion.cfg")
+# set(CONFIG_FLAGXX "--config ${CMAKE_BINARY_DIR}/dandelion++.cfg")
+
+# include(ExternalProject)
+# ExternalProject_Add(
+#   llvmproject
+#   PREFIX llvmproject
+#   GIT_REPOSITORY https://github.com/llvm/llvm-project
+#   GIT_TAG release/18.x
+#   SOURCE_SUBDIR llvm
+#   UPDATE_DISCONNECTED 1
+#   INSTALL_DIR ${CMAKE_BINARY_DIR}/llvm
+#   LIST_SEPARATOR ","
+#   CMAKE_ARGS
+#       -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+#       -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+#       -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+#       -DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY
+#       -DCMAKE_SYSTEM_NAME=Generic
+#       -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
+#       -DCMAKE_C_FLAGS:STRING=${CONFIG_FLAG}
+#       -DCMAKE_CXX_FLAGS:STRING=${CONFIG_FLAGXX}
+#       -DLLVM_ENABLE_PROJECTS=clang,lld
+#       -DLLVM_TARGETS_TO_BUILD=AArch64,X86
+#       -DBUILD_SHARED_LIBS=OFF
+#       -DLLVM_ENABLE_PIC=OFF
+#       -DLLVM_ENABLE_THREADS=OFF
+#   EXCLUDE_FROM_ALL TRUE
+# )

dandelionFunctionInterface

@@ -6,17 +6,12 @@ Some functions depend on the function interface directly while others use it
 through mlibc.
 
 # Building the C functions
-The cmake build process will build the function interface, libc and the functions.
-To do so cmake needs to know that it needs to use the cross compile file dandelion.
-Additionally, cmake and needs to know the platform to build for (cheri, mmu_freebsd, mmu_linux).
+The cmake build process will build the functions based on the latest version of the dandelion SDK.
+For this cmake meeds to know the platform to build for (cheri, mmu_freebsd, mmu_linux, debug) and architecture (x86_64, aarch64)
+The build type can be Release or Debug.
 From the top folder functions can be built with:
 ```
 mkdir build
 cd build
-cmake -DCMAKE_TOOLCHAIN_FILE=../functions/dandelion.cmake -DDANDELION_PLATFORM=<platform> -DTARGET_CPU=<target arch> ../functions
+cmake -DPLATFORM=<platform> -DARCHITECTURE=<target arch> -DCMAKE_BUILD_TYPE-<type> ../functions
 ```
-The mlibc build currently only seems to work with clang.
-To set this up set CC=clang and CXX=clang++ additionally set LDFLAGS=-fuse-ld=lld
-
-## Building dlibc
-To turn on building of libc enable the cmake option with `-DUSE_LIBC=on`