From 26fdd07088ddc0b072dbdaa9a6b77766d05ed983 Mon Sep 17 00:00:00 2001 From: Derek Schuff Date: Fri, 26 Sep 2025 21:45:58 +0000 Subject: [PATCH 1/7] Test PR for Circle --- .circleci/config.yml | 1 + test/third_party/posixtestsuite | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index dcba324a1ed4a..f82aeb7c4e862 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -573,6 +573,7 @@ jobs: EMCC_USE_NINJA: 1 EM_COMPILER_WRAPPER: "ccache" steps: + - run: echo "${CIRCLE_PR_NUMBER} ${CIRCLE_PULL_REQUEST} ${CIRCLE_REPOSITORY_URL} ${CIRCLE_BRANCH}" - checkout - run: name: get wasmer diff --git a/test/third_party/posixtestsuite b/test/third_party/posixtestsuite index 7ac21b152494f..869e266b090a8 160000 --- a/test/third_party/posixtestsuite +++ b/test/third_party/posixtestsuite @@ -1 +1 @@ -Subproject commit 7ac21b152494f22d7778ac35ddf3c04083111a82 +Subproject commit 869e266b090a8d44e51bb040904c942556b1e4ab From fe020fcdd31a0c57bfe5e02b4e4f627fe29395fa Mon Sep 17 00:00:00 2001 From: Derek Schuff Date: Fri, 26 Sep 2025 21:52:19 +0000 Subject: [PATCH 2/7] add cmpile-time interpolated fields --- .circleci/config.yml | 2 +- test/third_party/posixtestsuite | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f82aeb7c4e862..76998428b9aff 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -573,7 +573,7 @@ jobs: EMCC_USE_NINJA: 1 EM_COMPILER_WRAPPER: "ccache" steps: - - run: echo "${CIRCLE_PR_NUMBER} ${CIRCLE_PULL_REQUEST} ${CIRCLE_REPOSITORY_URL} ${CIRCLE_BRANCH}" + - run: echo "${CIRCLE_PR_NUMBER} ${CIRCLE_PULL_REQUEST} ${CIRCLE_REPOSITORY_URL} ${CIRCLE_BRANCH} << pipeline.project.git_url >> << pipeline.git.branch >>" - checkout - run: name: get wasmer diff --git a/test/third_party/posixtestsuite b/test/third_party/posixtestsuite index 869e266b090a8..7ac21b152494f 160000 --- a/test/third_party/posixtestsuite +++ b/test/third_party/posixtestsuite @@ -1 +1 @@ -Subproject commit 869e266b090a8d44e51bb040904c942556b1e4ab +Subproject commit 7ac21b152494f22d7778ac35ddf3c04083111a82 From ba91808cf4b73287cd1f74afae5d446e4bc24b69 Mon Sep 17 00:00:00 2001 From: Derek Schuff Date: Thu, 2 Oct 2025 23:27:56 +0000 Subject: [PATCH 3/7] verbose ninja --- tools/system_libs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/system_libs.py b/tools/system_libs.py index 54296e0923bf4..314ef07e554ee 100644 --- a/tools/system_libs.py +++ b/tools/system_libs.py @@ -159,7 +159,7 @@ def get_top_level_ninja_file(): def run_ninja(build_dir): - cmd = ['ninja', '-C', build_dir, f'-j{utils.get_num_cores()}'] + cmd = ['ninja', '-v', '-C', build_dir, f'-j{utils.get_num_cores()}'] if shared.PRINT_SUBPROCS: cmd.append('-v') shared.check_call(cmd, env=clean_env()) From 86b0fbc3f3f4d181a424ec394416106ad11c0f13 Mon Sep 17 00:00:00 2001 From: Derek Schuff Date: Thu, 2 Oct 2025 23:50:20 +0000 Subject: [PATCH 4/7] logging --- .circleci/config.yml | 44 ++++++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c2f3192a83f2f..779c44b8835f4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -185,30 +185,31 @@ commands: - run: name: embuilder build ALL command: | - ./embuilder build ALL - ./test/runner test_hello_world - - run: - name: embuilder (LTO) - command: | - ./embuilder build MINIMAL --lto - ./test/runner test_hello_world - - run: - name: embuilder (WASM64) - command: | - ./embuilder build MINIMAL --wasm64 - - run: - name: embuilder (PIC) - command: | - ./embuilder build MINIMAL_PIC --pic - ./test/runner test_hello_world - - run: - name: embuilder (PIC+LTO) - command: | - ./embuilder build MINIMAL --pic --lto + ./embuilder build crtbegin ./test/runner test_hello_world + # - run: + # name: embuilder (LTO) + # command: | + # ./embuilder build MINIMAL --lto + # ./test/runner test_hello_world + # - run: + # name: embuilder (WASM64) + # command: | + # ./embuilder build MINIMAL --wasm64 + # - run: + # name: embuilder (PIC) + # command: | + # ./embuilder build MINIMAL_PIC --pic + # ./test/runner test_hello_world + # - run: + # name: embuilder (PIC+LTO) + # command: | + # ./embuilder build MINIMAL --pic --lto + # ./test/runner test_hello_world - run: name: "Ccache stats and configuration" command: | + ls ~/ccache-debug date ccache -s ccache --print-stats @@ -572,6 +573,9 @@ jobs: EMCC_CORES: 16 EMCC_USE_NINJA: 1 EM_COMPILER_WRAPPER: "ccache" + CCACHE_DEBUG: 1 + CCACHE_DEBUGLEVEL: 1 + CCACHE_DEBUGDIR: ~/ccache-debug steps: - run: echo "${CIRCLE_PR_NUMBER} ${CIRCLE_PULL_REQUEST} ${CIRCLE_REPOSITORY_URL} ${CIRCLE_BRANCH} << pipeline.project.git_url >> << pipeline.git.branch >>" - checkout From dc30bc9c9a09689ccf6b33d20623c1d500ae12b9 Mon Sep 17 00:00:00 2001 From: Derek Schuff Date: Thu, 2 Oct 2025 23:58:05 +0000 Subject: [PATCH 5/7] more logging --- .circleci/config.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 779c44b8835f4..ed0e322eb65cc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -179,6 +179,7 @@ commands: - run: name: Ccache stats and configuration command: | + ccache --version ccache -s ccache --print-stats ccache -p @@ -209,7 +210,8 @@ commands: - run: name: "Ccache stats and configuration" command: | - ls ~/ccache-debug + ls ~/ccache-debug || echo "no ccache-debug" + ls ~/cache/sysroot/lib/wasm32-emscripten || echo "no build" date ccache -s ccache --print-stats From 9fd7ed4adb9186c0ae1b01a3cc579be546c6ae0d Mon Sep 17 00:00:00 2001 From: Derek Schuff Date: Fri, 3 Oct 2025 00:07:54 +0000 Subject: [PATCH 6/7] test hits --- .circleci/config.yml | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ed0e322eb65cc..2bb2b8a57218f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -143,7 +143,7 @@ commands: ./emsdk install tot ./emsdk activate tot # Write the version of clang into a file for use in the ccache key - ./upstream/bin/clang --version > clang_version.txt + echo "test21" > clang_version.txt echo "clang version:" cat ~/emsdk/clang_version.txt # Remove the emsdk version of emscripten to save space in the @@ -231,18 +231,12 @@ commands: - vms/ - wasi-sdk/ - .jsvu/ - - when: - # Only the main branch will store its cache results, and only the non-main branches - # will use cached results. This prevents untrusted PRs from polluting caches used - # by other branches. - condition: - equal: [ "main", << pipeline.git.branch >> ] - steps: - - save_cache: - name: "Save Ccache cache" - paths: - - ~/.ccache - key: clang-{{ checksum "~/emsdk/clang_version.txt" }} + + - save_cache: + name: "Save Ccache cache" + paths: + - ~/.ccache + key: clang-{{ checksum "~/emsdk/clang_version.txt" }} prepare-for-tests: description: "Setup emscripten tests" From 0cd553354d159575dcea14929f4dafe589bb3246 Mon Sep 17 00:00:00 2001 From: Derek Schuff Date: Fri, 3 Oct 2025 00:16:51 +0000 Subject: [PATCH 7/7] print log --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2bb2b8a57218f..564a4a238a90b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -212,6 +212,7 @@ commands: command: | ls ~/ccache-debug || echo "no ccache-debug" ls ~/cache/sysroot/lib/wasm32-emscripten || echo "no build" + cat ~/cache/sysroot/lib/wasm32-emscripten/crtbegin.o.ccache-log date ccache -s ccache --print-stats