From 0a82addf0285ad5c81b1e085570f40be34b70d14 Mon Sep 17 00:00:00 2001 From: Sebastian Miasojed Date: Wed, 20 Nov 2024 17:15:55 +0100 Subject: [PATCH] Add directory arg support to clone-llvm --- Makefile | 1 + build-llvm.sh | 5 ++-- clone-llvm.sh | 13 +++++++++-- emscripten-build-llvm.sh | 50 +++++++++++++++++++--------------------- js/run_revive.js | 11 ++++----- 5 files changed, 43 insertions(+), 37 deletions(-) diff --git a/Makefile b/Makefile index 5b08eda..b998a0d 100644 --- a/Makefile +++ b/Makefile @@ -10,6 +10,7 @@ RUSTFLAGS_EMSCRIPTEN := \ -Clink-arg=-sEXPORTED_RUNTIME_METHODS=FS,callMain,stringToNewUTF8,cwrap \ -Clink-arg=-sMODULARIZE \ -Clink-arg=-sEXPORT_ES6 \ + -Clink-arg=-sEXPORT_NAME=createRevive \ -Clink-arg=--js-library=js/soljson_interface.js \ -Clink-arg=--pre-js=js/pre.js diff --git a/build-llvm.sh b/build-llvm.sh index 71838f6..e84945d 100755 --- a/build-llvm.sh +++ b/build-llvm.sh @@ -5,12 +5,13 @@ set -euo pipefail INSTALL_DIR="${PWD}/llvm18.0" mkdir -p ${INSTALL_DIR} -./clone-llvm.sh - # Build LLVM, clang LLVM_SRC_PREFIX=${PWD}/llvm-project LLVM_SRC_DIR=${LLVM_SRC_PREFIX}/llvm LLVM_BUILD_DIR=${LLVM_SRC_PREFIX}/build/llvm + +./clone-llvm.sh "${LLVM_SRC_PREFIX}" + if [ ! -d ${LLVM_BUILD_DIR} ] ; then mkdir -p ${LLVM_BUILD_DIR} fi diff --git a/clone-llvm.sh b/clone-llvm.sh index 69526af..e79323e 100755 --- a/clone-llvm.sh +++ b/clone-llvm.sh @@ -1,6 +1,15 @@ #!/bin/bash +# Default directory for cloning the llvm-project repository +DEFAULT_DIR="llvm-project" + +# Check if a directory argument is provided +if [ $# -eq 1 ]; then + DIR=$1 +else + DIR=$DEFAULT_DIR +fi # Clone LLVM 18 (any revision after commit bd32aaa is supposed to work) -if [ ! -d "llvm-project" ]; then - git clone --depth 1 --branch release/18.x https://github.com/llvm/llvm-project.git +if [ ! -d "${DIR}" ]; then + git clone --depth 1 --branch release/18.x https://github.com/llvm/llvm-project.git "${DIR}" fi diff --git a/emscripten-build-llvm.sh b/emscripten-build-llvm.sh index 76cf728..48c47db 100755 --- a/emscripten-build-llvm.sh +++ b/emscripten-build-llvm.sh @@ -3,46 +3,44 @@ set -euo pipefail INSTALL_DIR="${PWD}/llvm18.0-emscripten" -mkdir -p ${INSTALL_DIR} - -./clone-llvm.sh - -# Build LLVM, clang -cd llvm-project +mkdir -p "${INSTALL_DIR}" # Check if EMSDK_ROOT is defined -if [ -z "$EMSDK_ROOT" ]; then +if [ -z "${EMSDK_ROOT:-}" ]; then echo "Error: EMSDK_ROOT is not defined." echo "Please set the EMSDK_ROOT environment variable to the root directory of your Emscripten SDK." exit 1 fi -source ${EMSDK_ROOT}/emsdk_env.sh +source "${EMSDK_ROOT}/emsdk_env.sh" -LLVM_SRC=$(pwd) +LLVM_SRC=$(pwd)/llvm-project LLVM_SRC=$(realpath "$LLVM_SRC") -LLVM_NATIVE=$LLVM_SRC/build-native -LLVM_WASM=$LLVM_SRC/build-wasm +LLVM_NATIVE="${LLVM_SRC}/build-native" +LLVM_WASM="${LLVM_SRC}/build-wasm" -# Cross compiling llvm needs a native build of "llvm-tblgen" and "clang-tblgen" -if [ ! -d $LLVM_NATIVE/ ]; then +./clone-llvm.sh "${LLVM_SRC}" + +# Cross-compiling LLVM requires a native build of "llvm-tblgen" and "clang-tblgen" +if [ ! -d "${LLVM_NATIVE}" ]; then cmake -G Ninja \ - -S $LLVM_SRC/llvm/ \ - -B $LLVM_NATIVE/ \ + -S "${LLVM_SRC}/llvm" \ + -B "${LLVM_NATIVE}" \ -DCMAKE_BUILD_TYPE=Release \ -DLLVM_TARGETS_TO_BUILD=WebAssembly \ -DLLVM_ENABLE_PROJECTS="clang" fi -cmake --build $LLVM_NATIVE/ -- llvm-tblgen clang-tblgen llvm-config -if [ ! -d $LLVM_WASM/ ]; then +cmake --build "${LLVM_NATIVE}" -- llvm-tblgen clang-tblgen llvm-config + +if [ ! -d "${LLVM_WASM}" ]; then EMCC_DEBUG=2 \ CXXFLAGS="-Dwait4=__syscall_wait4" \ LDFLAGS="-lnodefs.js -s NO_INVOKE_RUN -s EXIT_RUNTIME -s INITIAL_MEMORY=64MB -s ALLOW_MEMORY_GROWTH -s \ EXPORTED_RUNTIME_METHODS=FS,callMain,NODEFS -s MODULARIZE -s EXPORT_ES6 -s WASM_BIGINT" \ emcmake cmake -G Ninja \ - -S $LLVM_SRC/llvm/ \ - -B $LLVM_WASM/ \ + -S "${LLVM_SRC}/llvm" \ + -B "${LLVM_WASM}" \ -DCMAKE_BUILD_TYPE=Release \ -DLLVM_TARGETS_TO_BUILD='RISCV' \ -DLLVM_ENABLE_PROJECTS="clang;lld" \ @@ -58,15 +56,15 @@ if [ ! -d $LLVM_WASM/ ]; then -DLLVM_ENABLE_LIBXML2=Off \ -DLLVM_ENABLE_ZLIB=Off \ -DLLVM_ENABLE_ZSTD=Off \ - -DLLVM_TABLEGEN=$LLVM_NATIVE/bin/llvm-tblgen \ - -DCLANG_TABLEGEN=$LLVM_NATIVE/bin/clang-tblgen \ - -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}/ + -DLLVM_TABLEGEN="${LLVM_NATIVE}/bin/llvm-tblgen" \ + -DCLANG_TABLEGEN="${LLVM_NATIVE}/bin/clang-tblgen" \ + -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}" fi -cmake --build $LLVM_WASM/ -cmake --install $LLVM_WASM/ +cmake --build "${LLVM_WASM}" +cmake --install "${LLVM_WASM}" -cp $LLVM_NATIVE/bin/llvm-config $INSTALL_DIR/bin +cp "${LLVM_NATIVE}/bin/llvm-config" "${INSTALL_DIR}/bin" echo "" -echo "success" +echo "LLVM cross-compilation for WebAssembly completed successfully." diff --git a/js/run_revive.js b/js/run_revive.js index efbc186..94ee6c3 100644 --- a/js/run_revive.js +++ b/js/run_revive.js @@ -1,9 +1,6 @@ -import { createRequire } from 'module'; -const require = createRequire(import.meta.url); import solc from 'solc'; - // Import the Emscripten module -import Module from './resolc.js'; +import createRevive from './resolc.js'; const compilerStandardJsonInput = { language: 'Solidity', @@ -34,7 +31,7 @@ const compilerStandardJsonInput = { }; async function runCompiler() { - const m = await Module(); + const m = await createRevive(); m.solc = solc; // Set input data for stdin @@ -56,8 +53,8 @@ async function runCompiler() { // Compile the Solidity source code let x = m.callMain(['--standard-json']); - console.log(stdoutString) - console.error(stderrString) + console.log("Stdout: " + stdoutString) + console.error("Stderr: " + stderrString) } runCompiler().catch(err => {