From 8b4e9f90ba045edb14cb2800c506ee6bc5118cd7 Mon Sep 17 00:00:00 2001 From: Arthur LAURENT Date: Wed, 21 May 2025 01:37:17 +0200 Subject: [PATCH 1/3] (C++ modules support) refactor tests --- .../{cmake => class_cmake}/src/hello.mpp | 0 .../{cmake => class_cmake}/src/hello_impl.cpp | 0 .../{cmake => class_cmake}/src/main.cpp | 0 .../projects/c++/modules/class_cmake/test.lua | 1 + .../modules/{cmake => class_cmake}/xmake.lua | 0 tests/projects/c++/modules/culling/test.lua | 70 +------ tests/projects/c++/modules/culling2/test.lua | 70 +------ tests/projects/c++/modules/culling3/test.lua | 70 +------ .../modules/duplicate_name_detection/test.lua | 76 +------ .../c++/modules/internal_partition/test.lua | 2 +- .../c++/modules/packages-subtarget/test.lua | 2 +- tests/projects/c++/modules/packages/test.lua | 2 +- .../projects/c++/modules/partitions/test.lua | 2 +- .../c++/modules/partitions_implunit/test.lua | 2 +- .../c++/modules/partitions_implunit2/test.lua | 2 +- tests/projects/c++/modules/test_base.lua | 188 +++++++++++++++--- .../{cmake/test.lua => test_cmake.lua} | 18 ++ tests/projects/c++/modules/test_culling.lua | 13 ++ .../c++/modules/test_dependency_scanner.lua | 70 +------ .../c++/modules/test_duplicate_modules.lua | 33 +++ .../projects/c++/modules/test_headerunits.lua | 75 +------ .../projects/c++/modules/test_partitions.lua | 12 ++ .../projects/c++/modules/test_stdmodules.lua | 88 +++----- xmake/rules/c++/modules/msvc/support.lua | 6 +- 24 files changed, 296 insertions(+), 506 deletions(-) rename tests/projects/c++/modules/{cmake => class_cmake}/src/hello.mpp (100%) rename tests/projects/c++/modules/{cmake => class_cmake}/src/hello_impl.cpp (100%) rename tests/projects/c++/modules/{cmake => class_cmake}/src/main.cpp (100%) create mode 100644 tests/projects/c++/modules/class_cmake/test.lua rename tests/projects/c++/modules/{cmake => class_cmake}/xmake.lua (100%) rename tests/projects/c++/modules/{cmake/test.lua => test_cmake.lua} (74%) create mode 100644 tests/projects/c++/modules/test_culling.lua create mode 100644 tests/projects/c++/modules/test_duplicate_modules.lua create mode 100644 tests/projects/c++/modules/test_partitions.lua diff --git a/tests/projects/c++/modules/cmake/src/hello.mpp b/tests/projects/c++/modules/class_cmake/src/hello.mpp similarity index 100% rename from tests/projects/c++/modules/cmake/src/hello.mpp rename to tests/projects/c++/modules/class_cmake/src/hello.mpp diff --git a/tests/projects/c++/modules/cmake/src/hello_impl.cpp b/tests/projects/c++/modules/class_cmake/src/hello_impl.cpp similarity index 100% rename from tests/projects/c++/modules/cmake/src/hello_impl.cpp rename to tests/projects/c++/modules/class_cmake/src/hello_impl.cpp diff --git a/tests/projects/c++/modules/cmake/src/main.cpp b/tests/projects/c++/modules/class_cmake/src/main.cpp similarity index 100% rename from tests/projects/c++/modules/cmake/src/main.cpp rename to tests/projects/c++/modules/class_cmake/src/main.cpp diff --git a/tests/projects/c++/modules/class_cmake/test.lua b/tests/projects/c++/modules/class_cmake/test.lua new file mode 100644 index 00000000000..703d66bdc39 --- /dev/null +++ b/tests/projects/c++/modules/class_cmake/test.lua @@ -0,0 +1 @@ +inherit(".test_cmake") diff --git a/tests/projects/c++/modules/cmake/xmake.lua b/tests/projects/c++/modules/class_cmake/xmake.lua similarity index 100% rename from tests/projects/c++/modules/cmake/xmake.lua rename to tests/projects/c++/modules/class_cmake/xmake.lua diff --git a/tests/projects/c++/modules/culling/test.lua b/tests/projects/c++/modules/culling/test.lua index 90832e424c9..7232ae64407 100644 --- a/tests/projects/c++/modules/culling/test.lua +++ b/tests/projects/c++/modules/culling/test.lua @@ -1,69 +1 @@ -import("lib.detect.find_tool") -import("core.base.semver") -import("utils.ci.is_running", {alias = "ci_is_running"}) - -function _build() - local outdata - if ci_is_running() then - outdata = os.iorun("xmake -rvD") - else - outdata = os.iorun("xmake -rv") - end - if outdata then - if outdata:find("culled") then - raise("Modules culling does not work\n%s", outdata) - end - end -end - -function can_build() - if is_subhost("windows") then - return true - elseif is_subhost("msys") then - return true - elseif is_host("linux") then - local gcc = find_tool("gcc", {version = true}) - if gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then - return true - end - local clang = find_tool("clang", {version = true}) - if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then - return true - end - end -end - -function main(t) - if is_subhost("windows") then - local clang = find_tool("clang", {version = true}) - if clang and clang.version and semver.compare(clang.version, "17.0") >= 0 then - os.exec("xmake f --toolchain=clang -c --yes --policies=build.c++.modules.std:n") - _build() - os.exec("xmake clean -a") - os.exec("xmake f --toolchain=clang --runtimes=c++_shared -c --yes --policies=build.c++.modules.std:n") - _build() - end - - os.exec("xmake clean -a") - os.exec("xmake f -c --yes --policies=build.c++.modules.std:n") - _build() - elseif is_subhost("msys") then - os.exec("xmake f -c -p mingw --yes --policies=build.c++.modules.std:n") - _build() - elseif is_host("linux") then - local gcc = find_tool("gcc", {version = true}) - if gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then - os.exec("xmake f -c --yes --policies=build.c++.modules.std:n") - _build() - end - local clang = find_tool("clang", {version = true}) - if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then - os.exec("xmake clean -a") - os.exec("xmake f --toolchain=clang -c --yes --policies=build.c++.modules.std:n") - _build() - os.exec("xmake clean -a") - os.exec("xmake f --toolchain=clang --runtimes=c++_shared -c --yes --policies=build.c++.modules.std:n") - _build() - end - end -end +inherit(".test_culling") diff --git a/tests/projects/c++/modules/culling2/test.lua b/tests/projects/c++/modules/culling2/test.lua index 90832e424c9..7232ae64407 100644 --- a/tests/projects/c++/modules/culling2/test.lua +++ b/tests/projects/c++/modules/culling2/test.lua @@ -1,69 +1 @@ -import("lib.detect.find_tool") -import("core.base.semver") -import("utils.ci.is_running", {alias = "ci_is_running"}) - -function _build() - local outdata - if ci_is_running() then - outdata = os.iorun("xmake -rvD") - else - outdata = os.iorun("xmake -rv") - end - if outdata then - if outdata:find("culled") then - raise("Modules culling does not work\n%s", outdata) - end - end -end - -function can_build() - if is_subhost("windows") then - return true - elseif is_subhost("msys") then - return true - elseif is_host("linux") then - local gcc = find_tool("gcc", {version = true}) - if gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then - return true - end - local clang = find_tool("clang", {version = true}) - if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then - return true - end - end -end - -function main(t) - if is_subhost("windows") then - local clang = find_tool("clang", {version = true}) - if clang and clang.version and semver.compare(clang.version, "17.0") >= 0 then - os.exec("xmake f --toolchain=clang -c --yes --policies=build.c++.modules.std:n") - _build() - os.exec("xmake clean -a") - os.exec("xmake f --toolchain=clang --runtimes=c++_shared -c --yes --policies=build.c++.modules.std:n") - _build() - end - - os.exec("xmake clean -a") - os.exec("xmake f -c --yes --policies=build.c++.modules.std:n") - _build() - elseif is_subhost("msys") then - os.exec("xmake f -c -p mingw --yes --policies=build.c++.modules.std:n") - _build() - elseif is_host("linux") then - local gcc = find_tool("gcc", {version = true}) - if gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then - os.exec("xmake f -c --yes --policies=build.c++.modules.std:n") - _build() - end - local clang = find_tool("clang", {version = true}) - if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then - os.exec("xmake clean -a") - os.exec("xmake f --toolchain=clang -c --yes --policies=build.c++.modules.std:n") - _build() - os.exec("xmake clean -a") - os.exec("xmake f --toolchain=clang --runtimes=c++_shared -c --yes --policies=build.c++.modules.std:n") - _build() - end - end -end +inherit(".test_culling") diff --git a/tests/projects/c++/modules/culling3/test.lua b/tests/projects/c++/modules/culling3/test.lua index d6745625a5e..7232ae64407 100644 --- a/tests/projects/c++/modules/culling3/test.lua +++ b/tests/projects/c++/modules/culling3/test.lua @@ -1,69 +1 @@ -import("lib.detect.find_tool") -import("core.base.semver") -import("utils.ci.is_running", {alias = "ci_is_running"}) - -function _build() - local outdata - if ci_is_running() then - outdata = os.iorun("xmake -rvD") - else - outdata = os.iorun("xmake -rv") - end - if outdata then - if not outdata:find("culled") then - raise("Modules culling does not work\n%s", outdata) - end - end -end - -function can_build() - if is_subhost("windows") then - return true - elseif is_subhost("msys") then - return true - elseif is_host("linux") then - local gcc = find_tool("gcc", {version = true}) - if gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then - return true - end - local clang = find_tool("clang", {version = true}) - if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then - return true - end - end -end - -function main(t) - if is_subhost("windows") then - local clang = find_tool("clang", {version = true}) - if clang and clang.version and semver.compare(clang.version, "17.0") >= 0 then - os.exec("xmake f --toolchain=clang -c --yes --policies=build.c++.modules.std:n") - _build() - os.exec("xmake clean -a") - os.exec("xmake f --toolchain=clang --runtimes=c++_shared -c --yes --policies=build.c++.modules.std:n") - _build() - end - - os.exec("xmake clean -a") - os.exec("xmake f -c --yes --policies=build.c++.modules.std:n") - _build() - elseif is_subhost("msys") then - os.exec("xmake f -c -p mingw --yes --policies=build.c++.modules.std:n") - _build() - elseif is_host("linux") then - local gcc = find_tool("gcc", {version = true}) - if gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then - os.exec("xmake f -c --yes --policies=build.c++.modules.std:n") - _build() - end - local clang = find_tool("clang", {version = true}) - if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then - os.exec("xmake clean -a") - os.exec("xmake f --toolchain=clang -c --yes --policies=build.c++.modules.std:n") - _build() - os.exec("xmake clean -a") - os.exec("xmake f --toolchain=clang --runtimes=c++_shared -c --yes --policies=build.c++.modules.std:n") - _build() - end - end -end +inherit(".test_culling") diff --git a/tests/projects/c++/modules/duplicate_name_detection/test.lua b/tests/projects/c++/modules/duplicate_name_detection/test.lua index fd01ea575d1..0b041cca08c 100644 --- a/tests/projects/c++/modules/duplicate_name_detection/test.lua +++ b/tests/projects/c++/modules/duplicate_name_detection/test.lua @@ -1,75 +1 @@ -import("lib.detect.find_tool") -import("core.base.semver") -import("utils.ci.is_running", {alias = "ci_is_running"}) - -function _build() - try { - function() - if ci_is_running() then - os.run("xmake -rvD") - else - os.run("xmake -r") - end - end, - catch { - function (errors) - errors = tostring(errors) - if not errors:find("duplicate module name detected", 1, true) then - raise("Modules duplicate name detection does not work\n%s", errors) - end - end - } - } -end - -function can_build() - if is_subhost("windows") then - return true - elseif is_subhost("msys") then - return true - elseif is_host("linux") then - local gcc = find_tool("gcc", {version = true}) - if gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then - return true - end - local clang = find_tool("clang", {version = true}) - if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then - return true - end - end -end - -function main(t) - if is_subhost("windows") then - local clang = find_tool("clang", {version = true}) - if clang and clang.version and semver.compare(clang.version, "17.0") >= 0 then - os.exec("xmake f --toolchain=clang -c --yes --policies=build.c++.modules.std:n") - _build() - os.exec("xmake clean -a") - os.exec("xmake f --toolchain=clang --runtimes=c++_shared -c --yes --policies=build.c++.modules.std:n") - _build() - end - - os.exec("xmake clean -a") - os.exec("xmake f -c --yes --policies=build.c++.modules.std:n") - _build() - elseif is_subhost("msys") then - os.exec("xmake f -c -p mingw --yes --policies=build.c++.modules.std:n") - _build() - elseif is_host("linux") then - local gcc = find_tool("gcc", {version = true}) -if gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then - os.exec("xmake f -c --yes --policies=build.c++.modules.std:n") - _build() - end - local clang = find_tool("clang", {version = true}) - if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then - os.exec("xmake clean -a") - os.exec("xmake f --toolchain=clang -c --yes --policies=build.c++.modules.std:n") - _build() - os.exec("xmake clean -a") - os.exec("xmake f --toolchain=clang --runtimes=c++_shared -c --yes --policies=build.c++.modules.std:n") - _build() - end - end -end +inherit(".test_duplicate_modules") diff --git a/tests/projects/c++/modules/internal_partition/test.lua b/tests/projects/c++/modules/internal_partition/test.lua index 7717f804997..082bfbcaf91 100644 --- a/tests/projects/c++/modules/internal_partition/test.lua +++ b/tests/projects/c++/modules/internal_partition/test.lua @@ -1 +1 @@ -inherit(".test_base") +inherit(".test_partitions") diff --git a/tests/projects/c++/modules/packages-subtarget/test.lua b/tests/projects/c++/modules/packages-subtarget/test.lua index c18e5a1d086..7717f804997 100644 --- a/tests/projects/c++/modules/packages-subtarget/test.lua +++ b/tests/projects/c++/modules/packages-subtarget/test.lua @@ -1 +1 @@ -inherit(".test_headerunits") +inherit(".test_base") diff --git a/tests/projects/c++/modules/packages/test.lua b/tests/projects/c++/modules/packages/test.lua index c18e5a1d086..7717f804997 100644 --- a/tests/projects/c++/modules/packages/test.lua +++ b/tests/projects/c++/modules/packages/test.lua @@ -1 +1 @@ -inherit(".test_headerunits") +inherit(".test_base") diff --git a/tests/projects/c++/modules/partitions/test.lua b/tests/projects/c++/modules/partitions/test.lua index e77adc4aec2..082bfbcaf91 100644 --- a/tests/projects/c++/modules/partitions/test.lua +++ b/tests/projects/c++/modules/partitions/test.lua @@ -1 +1 @@ -inherit(".test_stdmodules") +inherit(".test_partitions") diff --git a/tests/projects/c++/modules/partitions_implunit/test.lua b/tests/projects/c++/modules/partitions_implunit/test.lua index e77adc4aec2..082bfbcaf91 100644 --- a/tests/projects/c++/modules/partitions_implunit/test.lua +++ b/tests/projects/c++/modules/partitions_implunit/test.lua @@ -1 +1 @@ -inherit(".test_stdmodules") +inherit(".test_partitions") diff --git a/tests/projects/c++/modules/partitions_implunit2/test.lua b/tests/projects/c++/modules/partitions_implunit2/test.lua index e77adc4aec2..082bfbcaf91 100644 --- a/tests/projects/c++/modules/partitions_implunit2/test.lua +++ b/tests/projects/c++/modules/partitions_implunit2/test.lua @@ -1 +1 @@ -inherit(".test_stdmodules") +inherit(".test_partitions") diff --git a/tests/projects/c++/modules/test_base.lua b/tests/projects/c++/modules/test_base.lua index e7919761f82..f060cfa0c9b 100644 --- a/tests/projects/c++/modules/test_base.lua +++ b/tests/projects/c++/modules/test_base.lua @@ -1,16 +1,35 @@ import("lib.detect.find_tool") import("core.base.semver") +import("core.tool.toolchain") import("utils.ci.is_running", {alias = "ci_is_running"}) -function _build() - if ci_is_running() then - os.run("xmake -rvD") +CLANG_MIN_VER = "17" +GCC_MIN_VER = "11" +MSVC_MIN_VER = "14.29" + +function _build(check_outdata) + if check_outdata then + local outdata + if ci_is_running() then + outdata = os.iorun("xmake -rvD") + else + outdata = os.iorun("xmake -rv") + end + if outdata then + if outdata:find(check_outdata.str, 1, true) then + raise(check_outdata.format_string, outdata) + end + end else - os.run("xmake -r") + if ci_is_running() then + os.run("xmake -rvD") + else + os.run("xmake -r") + end end local outdata = os.iorun("xmake") if outdata then - if outdata:find("compiling") or outdata:find("linking") or outdata:find("generating") then + if outdata:find("compiling", 1, true) or outdata:find("linking", 1, true) or outdata:find("generating", 1, true) then raise("Modules incremental compilation does not work\n%s", outdata) end end @@ -23,47 +42,152 @@ function can_build() return true elseif is_host("linux") then local gcc = find_tool("gcc", {version = true}) - if gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then + if gcc and gcc.version and semver.compare(gcc.version, GCC_MIN_VER) >= 0 then return true end local clang = find_tool("clang", {version = true}) - if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then + if clang and clang.version and semver.compare(clang.version, CLANG_MIN_VER) >= 0 then return true end end end -function main(t) +function build_tests(toolchain_name, opt) + assert(opt and opt.version) + local version if is_subhost("windows") then - local clang = find_tool("clang", {version = true}) - if clang and clang.version and semver.compare(clang.version, "17.0") >= 0 then - os.exec("xmake f --toolchain=clang -c --yes --policies=build.c++.modules.std:n") - _build() - os.exec("xmake clean -a") - os.exec("xmake f --toolchain=clang --runtimes=c++_shared -c --yes --policies=build.c++.modules.std:n") - _build() + local msvc = toolchain.load("msvc") + if not msvc or not msvc:check() then + wprint("msvc not found, skipping tests") + return end + local vcvars = msvc:config("vcvars") + if not vcvars or not vcvars.VCInstallDir or not vcvars.VCToolsVersion then + wprint("msvc not found, skipping tests") + return + end + version = vcvars.VCToolsVersion + end + if opt.compiler then + local cc = find_tool(opt.compiler, {version = true}) + if not cc then + wprint(opt.compiler .. " not found, skipping tests") + return + end + version = cc.version + end + + local compiler = toolchain_name == "msvc" and "cl" or opt.compiler + if not version or not (semver.compare(version, opt.version) >= 0) then + local version_str = compiler .. " >= " .. opt.version .. (version and " (found " .. version .. ")" or "") .. " " + wprint(version_str .. "not found, skipping tests") + return + end + + local policies = "--policies=build.c++.modules.std:" .. (opt.stdmodule and "y" or "n") + policies = policies .. ",build.c++.modules.fallbackscanner:" .. (opt.fallbackscanner and "y" or "n") + + local platform = " " + if opt.platform then + platform = " -p " .. opt.platform .. " " + end + + local runtimes = " " + if opt.runtimes then + runtimes = " --runtimes=" .. opt.runtimes .. " " + print("running with config: (toolchain: %s, compiler: %s, version: %s, runtimes: %s)", toolchain_name, compiler, version, opt.runtimes) + else + print("running with config: (toolchain: %s, compiler: %s, version: %s)", toolchain_name, compiler, version) + end + + local flags = "" + if opt.flags then + flags = " " .. table.concat(opt.flags, " ") + end - os.exec("xmake clean -a") - os.exec("xmake f -c --yes --policies=build.c++.modules.std:n") - _build() + os.exec("xmake clean -a") + os.exec("xmake f" .. platform .. "--toolchain=" .. toolchain_name .. runtimes .. "-c --yes " .. policies .. flags) + if opt.build then + opt.build() + else + _build(opt.find_in_outdata) + end + if opt.after_build then + opt.after_build(platform, toolchain_name, runtimes, policies, flags) + end +end + +function run_tests(clang_options, gcc_options, msvc_options) + local clang_libcpp_options + if clang_options then + clang_libcpp_options = table.clone(clang_options) + clang_libcpp_options.runtimes = "c++_shared" + end + if is_subhost("windows") then + if clang_options then + build_tests("llvm", clang_options) + build_tests("clang", clang_options) + if not clang_options.stdmodule then + build_tests("llvm", clang_libcpp_options) + build_tests("clang", clang_libcpp_options) + else + wprint("std modules tests skipped for Windows clang libc++ as it's not currently supported officially") + end + end + if msvc_options then + build_tests("msvc", msvc_options) + end + elseif is_subhost("macosx") then + if clang_options then + -- macOS doesn't ship clang-scan-deps currently + if is_subhost("macosx") then + -- check if normal clang is avalaible + local regular_clang_available = false + + local outdata = os.iorun("clang --version") + if outdata then + regular_clang_available = true + if outdata:find("Apple") then + regular_clang_available = false + end + end + if not regular_clang_available then + wprint("Appleclang isn't shipped with clang-scan-deps, disabling modules tests") + return + end + end + build_tests("llvm", clang_options) + build_tests("clang", clang_options) + end elseif is_subhost("msys") then - os.exec("xmake f -c -p mingw --yes --policies=build.c++.modules.std:n") - _build() + if clang_options then + clang_options.platform = "mingw" + clang_libcpp_options.platform = "mingw" + build_tests("llvm", clang_options) + build_tests("clang", clang_options) + build_tests("llvm", clang_libcpp_options) + build_tests("clang", clang_libcpp_options) + end + if gcc_options then + gcc_options.platform = "mingw" + build_tests("gcc", gcc_options) + end elseif is_host("linux") then - local gcc = find_tool("gcc", {version = true}) - if gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then - os.exec("xmake f -c --yes --policies=build.c++.modules.std:n") - _build() + if clang_options then + build_tests("llvm", clang_options) + build_tests("clang", clang_options) + build_tests("llvm", clang_libcpp_options) + build_tests("clang", clang_libcpp_options) end - local clang = find_tool("clang", {version = true}) - if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then - os.exec("xmake clean -a") - os.exec("xmake f --toolchain=clang -c --yes --policies=build.c++.modules.std:n") - _build() - os.exec("xmake clean -a") - os.exec("xmake f --toolchain=clang --runtimes=c++_shared -c --yes --policies=build.c++.modules.std:n") - _build() + if gcc_options then + build_tests("gcc", gcc_options) end end end + +function main(_) + local clang_options = {compiler = "clang", version = CLANG_MIN_VER} + local gcc_options = {compiler = "gcc", version = GCC_MIN_VER} + local msvc_options = {version = MSVC_MIN_VER} + run_tests(clang_options, gcc_options, msvc_options) +end diff --git a/tests/projects/c++/modules/cmake/test.lua b/tests/projects/c++/modules/test_cmake.lua similarity index 74% rename from tests/projects/c++/modules/cmake/test.lua rename to tests/projects/c++/modules/test_cmake.lua index 2b246c9a6fa..3f3355eb52a 100644 --- a/tests/projects/c++/modules/cmake/test.lua +++ b/tests/projects/c++/modules/test_cmake.lua @@ -55,6 +55,24 @@ function main(t) elseif is_subhost("linux") then _build_with("gcc", "14") _build_with("clang", "19") + elseif is_subhost("macosx") then + -- macOS doesn't ship clang-scan-deps currently + -- check if normal clang is avalaible + local regular_clang_available = false + + local outdata = os.iorun("clang --version") + if outdata then + regular_clang_available = true + if outdata:find("Apple") then + regular_clang_available = false + end + end + if not regular_clang_available then + wprint("Appleclang isn't shipped with clang-scan-deps, disabling modules tests") + return + end + _build_with("clang", "19") end + end end diff --git a/tests/projects/c++/modules/test_culling.lua b/tests/projects/c++/modules/test_culling.lua new file mode 100644 index 00000000000..66f96227aa1 --- /dev/null +++ b/tests/projects/c++/modules/test_culling.lua @@ -0,0 +1,13 @@ +inherit("test_base") + +CLANG_MIN_VER = "17" +GCC_MIN_VER = "11" +MSVC_MIN_VER = "14.29" + +function main(_) + local check_outdata = {str = "culled", format_string = "Modules culling does not work"} + local clang_options = {compiler = "clang", version = CLANG_MIN_VER, check_outdata = check_outdata} + local gcc_options = {compiler = "gcc", version = GCC_MIN_VER, check_outdata} + local msvc_options = {version = MSVC_MIN_VER, check_outdata} + run_tests(clang_options, gcc_options, msvc_options) +end diff --git a/tests/projects/c++/modules/test_dependency_scanner.lua b/tests/projects/c++/modules/test_dependency_scanner.lua index 5f56113c2ef..c27b52887fd 100644 --- a/tests/projects/c++/modules/test_dependency_scanner.lua +++ b/tests/projects/c++/modules/test_dependency_scanner.lua @@ -1,9 +1,12 @@ -import("lib.detect.find_tool") -import("core.base.semver") +inherit("test_base") import("utils.ci.is_running", {alias = "ci_is_running"}) -function _build() - os.run("xmake f --foo=n --policies=build.c++.modules.std:n") +CLANG_MIN_VER = "17" +GCC_MIN_VER = "11" +MSVC_MIN_VER = "14.29" + +function _build(platform, toolchain_name, runtimes, policies, flags) + os.exec("xmake f" .. platform .. "--toolchain=" .. toolchain_name .. runtimes .. "-c --yes " .. policies .. " --foo=n") local outdata if ci_is_running() then outdata = os.iorun("xmake -rvD") @@ -15,62 +18,11 @@ function _build() raise("Modules dependency scanner update does not work\n%s", outdata) end end - outdata = os.iorun("xmake") - if outdata then - if outdata:find("compiling") or outdata:find("linking") or outdata:find("generating") then - raise("Modules incremental compilation does not work\n%s", outdata) - end - end -end - -function can_build() - if is_subhost("windows") then - return true - elseif is_subhost("msys") then - return true - elseif is_host("linux") then - local gcc = find_tool("gcc", {version = true}) - if gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then - return true - end - local clang = find_tool("clang", {version = true}) - if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then - return true - end - end end function main(t) - if is_subhost("windows") then - local clang = find_tool("clang", {version = true}) - if clang and clang.version and semver.compare(clang.version, "17.0") >= 0 then - os.exec("xmake f --toolchain=clang -c --yes --policies=build.c++.modules.std:n") - _build() - os.exec("xmake clean -a") - os.exec("xmake f --toolchain=clang --runtimes=c++_shared -c --yes --policies=build.c++.modules.std:n") - _build() - end - - os.exec("xmake clean -a") - os.exec("xmake f -c --yes --policies=build.c++.modules.std:n") - _build() - elseif is_subhost("msys") then - os.exec("xmake f -c -p mingw --yes --policies=build.c++.modules.std:n") - _build() - elseif is_host("linux") then - local gcc = find_tool("gcc", {version = true}) - if gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then - os.exec("xmake f -c --yes --policies=build.c++.modules.std:n") - _build() - end - local clang = find_tool("clang", {version = true}) - if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then - os.exec("xmake clean -a") - os.exec("xmake f --toolchain=clang -c --yes --policies=build.c++.modules.std:n") - _build() - os.exec("xmake clean -a") - os.exec("xmake f --toolchain=clang --runtimes=c++_shared -c --yes --policies=build.c++.modules.std:n") - _build() - end - end + local clang_options = {compiler = "clang", version = CLANG_MIN_VER, flags = {"--foo=y"}, after_build = _build} + local gcc_options = {compiler = "gcc", version = GCC_MIN_VER, flags = {"--foo=y"}, after_build = _build} + local msvc_options = {version = MSVC_MIN_VER, flags = {"--foo=y"}, after_build = _build} + run_tests(clang_options, gcc_options, msvc_options) end diff --git a/tests/projects/c++/modules/test_duplicate_modules.lua b/tests/projects/c++/modules/test_duplicate_modules.lua new file mode 100644 index 00000000000..76e8806f746 --- /dev/null +++ b/tests/projects/c++/modules/test_duplicate_modules.lua @@ -0,0 +1,33 @@ +inherit("test_base") +import("utils.ci.is_running", {alias = "ci_is_running"}) + +CLANG_MIN_VER = "17" +GCC_MIN_VER = "11" +MSVC_MIN_VER = "14.29" + +function _build() + try { + function() + if ci_is_running() then + os.run("xmake -rvD") + else + os.run("xmake -r") + end + end, + catch { + function (errors) + errors = tostring(errors) + if not errors:find("duplicate module name detected", 1, true) then + raise("Modules duplicate name detection does not work\n%s", errors) + end + end + } + } +end + +function main(_) + local clang_options = {compiler = "clang", version = CLANG_MIN_VER, build = _build} + local gcc_options = {compiler = "gcc", version = GCC_MIN_VER, build = _build} + local msvc_options = {version = MSVC_MIN_VER, build = _build} + run_tests(clang_options, gcc_options, msvc_options) +end diff --git a/tests/projects/c++/modules/test_headerunits.lua b/tests/projects/c++/modules/test_headerunits.lua index 264cca6e6fe..17f6373c058 100644 --- a/tests/projects/c++/modules/test_headerunits.lua +++ b/tests/projects/c++/modules/test_headerunits.lua @@ -1,70 +1,17 @@ -import("lib.detect.find_tool") -import("core.base.semver") -import("detect.sdks.find_vstudio") +inherit("test_base") import("utils.ci.is_running", {alias = "ci_is_running"}) -function _build() - if ci_is_running() then - os.run("xmake -rvD") - else - os.run("xmake -r") - end - local outdata = os.iorun("xmake") - if outdata then - if outdata:find("compiling") or outdata:find("linking") or outdata:find("generating") then - raise("Modules incremental compilation does not work\n%s", outdata) - end - end -end +GCC_MIN_VER = "11" +MSVC_MIN_VER = "14.30" function main(t) - if is_subhost("windows") then - local clang = find_tool("clang", {version = true}) - if clang and clang.version and semver.compare(clang.version, "15.0") >= 0 then - -- clang headerunit are bugged - -- os.exec("xmake f --toolchain=clang -c --yes --policies=build.c++.modules.std:n,build.c++.modules.fallbackscanner:y") - -- _build() - -- if semver.compare(clang.version, "17.0") >= 0 then - -- os.exec("xmake clean -a") - -- -- clang-scan-deps dependency detection doesn't support header units atm - -- os.exec("xmake f --toolchain=clang --runtimes=c++_shared -c --yes --policies=build.c++.modules.std:n,build.c++.modules.fallbackscanner:y") - -- _build() - -- end - end - - local vs = find_vstudio() - if vs and vs["2022"] then - os.exec("xmake clean -a") - os.exec("xmake f -c --yes --policies=build.c++.modules.std:n") - _build() - end - elseif is_subhost("msys") then - -- on windows, mingw modulemapper doesn't handle headeunit path correctly, but it's working with mingw on macOS / Linux - -- os.exec("xmake f -c -p mingw --yes --policies=build.c++.modules.std:n,build.c++.modules.fallbackscanner:y") - -- _build() - elseif is_host("linux") then - local gcc = find_tool("gcc", {version = true}) - if gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 and - os.arch() ~= "arm64" then -- gcc/arm64: internal compiler error: in core_vals, at cp/module.cc:6108 - -- gcc dependency detection doesn't support header units atm - os.exec("xmake f -c --yes --policies=build.c++.modules.std:n,build.c++.modules.fallbackscanner:y") - _build() - end - local clang = find_tool("clang", {version = true}) - if clang and clang.version then - if semver.compare(clang.version, "19.0") >= 0 then - os.exec("xmake clean -a") - -- clang-scan-deps dependency detection doesn't support header units atm - os.exec("xmake f --toolchain=clang -c --yes --policies=build.c++.modules.std:n,build.c++.modules.fallbackscanner:y") - _build() - end - -- libc++ headerunit are bugged - -- if semver.compare(clang.version, "17.0") >= 0 then - -- os.exec("xmake clean -a") - -- -- clang-scan-deps dependency detection doesn't support header units atm - -- os.exec("xmake f --toolchain=clang --runtimes=c++_shared -c --yes --policies=build.c++.modules.std:n,build.c++.modules.fallbackscanner:y") - -- _build() - -- end - end + local gcc_options = {fallbackscanner = true, compiler = "gcc", version = GCC_MIN_VER} + -- gcc/arm64: internal compiler error: in core_vals, at cp/module.cc:6108 + -- on windows, mingw modulemapper doesn't handle headeunit path correctly, but it's working with mingw on macOS / Linux + if os.arch() == "arm64" or is_subhost("msys") then + gcc_options = nil end + local msvc_options = {version = MSVC_MIN_VER} + -- skip clang tests, headerunits with clang is not stable + run_tests(nil, gcc_options, msvc_options) end diff --git a/tests/projects/c++/modules/test_partitions.lua b/tests/projects/c++/modules/test_partitions.lua new file mode 100644 index 00000000000..ed03bd9d725 --- /dev/null +++ b/tests/projects/c++/modules/test_partitions.lua @@ -0,0 +1,12 @@ +inherit("test_base") + +CLANG_MIN_VER = "18" +GCC_MIN_VER = "13" +MSVC_MIN_VER = "14.30" + +function main(_) + local clang_options = {compiler = "clang", version = CLANG_MIN_VER} + local gcc_options = {compiler = "gcc", version = GCC_MIN_VER} + local msvc_options = {version = MSVC_MIN_VER} + run_tests(clang_options, gcc_options, msvc_options) +end diff --git a/tests/projects/c++/modules/test_stdmodules.lua b/tests/projects/c++/modules/test_stdmodules.lua index 0ca1cc9dee8..c9062eb9657 100644 --- a/tests/projects/c++/modules/test_stdmodules.lua +++ b/tests/projects/c++/modules/test_stdmodules.lua @@ -1,65 +1,31 @@ -import("lib.detect.find_tool") -import("core.base.semver") -import("core.tool.toolchain") -import("utils.ci.is_running", {alias = "ci_is_running"}) +inherit("test_base") -function _build() - if ci_is_running() then - os.run("xmake -rvD") - else - os.run("xmake -r") - end - local outdata = os.iorun("xmake") - if outdata then - if outdata:find("compiling") or outdata:find("linking") or outdata:find("generating") then - raise("Modules incremental compilation does not work\n%s", outdata) - end - end -end +CLANG_MIN_VER = "19" +GCC_MIN_VER = "15" +MSVC_MIN_VER = "14.35" -function main(t) - if is_subhost("windows") then - local clang = find_tool("clang", {version = true}) - if clang and clang.version and semver.compare(clang.version, "19.0") >= 0 then - os.exec("xmake clean -a") - os.exec("xmake f --toolchain=clang -c --yes") - _build() - end - local msvc = toolchain.load("msvc") - if msvc and msvc:check() then - local vcvars = msvc:config("vcvars") - if vcvars and vcvars.VCInstallDir and vcvars.VCToolsVersion and semver.compare(vcvars.VCToolsVersion, "14.35") then - local stdmodulesdir = path.join(vcvars.VCInstallDir, "Tools", "MSVC", vcvars.VCToolsVersion, "modules") - if os.isdir(stdmodulesdir) then - os.exec("xmake clean -a") - os.exec("xmake f -c --yes") - _build() - end - end - end - elseif is_subhost("msys") then - local gcc = find_tool("gcc", {version = true}) - if is_host("linux") and gcc and gcc.version and semver.compare(gcc.version, "15.0") >= 0 then - os.exec("xmake f -c -p mingw --yes") - _build() - end - elseif is_host("linux") then -- or is_host("macosx") then - local gcc = find_tool("gcc", {version = true}) - if is_host("linux") and gcc and gcc.version and semver.compare(gcc.version, "15.0") >= 0 then - os.exec("xmake f -c --yes") - _build() - end - local clang = find_tool("clang", {version = true}) - if clang and clang.version and semver.compare(clang.version, "19.0") >= 0 then - local gcc = find_tool("clang", {version = true}) - if gcc and gcc.version and semver.compare(gcc.version, "15.0") >= 0 then - os.exec("xmake clean -a") - os.exec("xmake f --toolchain=clang -c --yes") - _build() - end - os.exec("xmake clean -a") - os.exec("xmake f --toolchain=clang --runtimes=c++_shared -c --yes") - _build() - end +function main(_) + local clang_options = {stdmodule = true, compiler = "clang", version = CLANG_MIN_VER} + -- latest mingw gcc 15.1 is broken + -- error: F:/msys64/mingw64/include/c++/15.1.0/shared_mutex:105:3: error: 'int std::__glibcxx_rwlock_timedrdlock(pthread_rwlock_t*, const timespec*)' exposes TU-local entity 'int pthread_rwlock_timedrdlock(pthread_rwlock_t*, const timespec*)' + -- 105 | __glibcxx_rwlock_timedrdlock (pthread_rwlock_t *__rwlock, + -- | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ + -- In file included from F:/msys64/mingw64/include/c++/15.1.0/x86_64-w64-mingw32/bits/gthr-default.h:35, + -- from F:/msys64/mingw64/include/c++/15.1.0/x86_64-w64-mingw32/bits/gthr.h:157, + -- from F:/msys64/mingw64/include/c++/15.1.0/ext/atomicity.h:37, + -- from F:/msys64/mingw64/include/c++/15.1.0/bits/ios_base.h:41, + -- from F:/msys64/mingw64/include/c++/15.1.0/streambuf:45, + -- from F:/msys64/mingw64/include/c++/15.1.0/bits/streambuf_iterator.h:37, + -- from F:/msys64/mingw64/include/c++/15.1.0/iterator:68, + -- from F:/msys64/mingw64/include/c++/15.1.0/x86_64-w64-mingw32/bits/stdc++.h:56: + -- F:/msys64/mingw64/include/pthread.h:296:28: note: 'int pthread_rwlock_timedrdlock(pthread_rwlock_t*, const timespec*)' declared with internal linkage + -- 296 | WINPTHREAD_RWLOCK_DECL int pthread_rwlock_timedrdlock(pthread_rwlock_t *l, const struct timespec *ts) + -- | ^~~~~~~~~~~~~~~~~~~~~~~~~~ + -- F:/msys64/mingw64/include/c++/15.1.0/shared_mutex:115:3: error: 'int std::__glibcxx_rwlock_timedwrlock(pthread_rwlock_t*, const timespec*)' exposes TU-local entity 'int pthread_rwlock_timedwrlock(pthread_rwlock_t*, const timespec*)' + -- 115 | __glibcxx_rwlock_timedwrlock (pthread_rwlock_t *__rwlock, local gcc_options = {stdmodule = true, compiler = "gcc", version = GCC_MIN_VER} + if is_subhost("msys") then + gcc_options = nil end + local msvc_options = {stdmodule = true, version = MSVC_MIN_VER} + run_tests(clang_options, gcc_options, msvc_options) end diff --git a/xmake/rules/c++/modules/msvc/support.lua b/xmake/rules/c++/modules/msvc/support.lua index 41c5cd44e89..c425ce91146 100644 --- a/xmake/rules/c++/modules/msvc/support.lua +++ b/xmake/rules/c++/modules/msvc/support.lua @@ -46,11 +46,13 @@ function load(target) local msvc = target:toolchain("msvc") if msvc then local vcvars = msvc:config("vcvars") - if vcvars.VCInstallDir and vcvars.VCToolsVersion and semver.compare(vcvars.VCToolsVersion, "14.35") > 0 then + if vcvars.VCInstallDir and vcvars.VCToolsVersion and semver.compare(vcvars.VCToolsVersion, "14.35") >= 0 then stdmodulesdir = path.join(vcvars.VCInstallDir, "Tools", "MSVC", vcvars.VCToolsVersion, "modules") end end - target:data_set("c++.msvc.enable_std_import", isatleastcpp23 and os.isdir(stdmodulesdir)) + if stdmodulesdir then + target:data_set("c++.msvc.enable_std_import", isatleastcpp23 and os.isdir(stdmodulesdir)) + end end end From 42ba909a17dd780a8bf1ba51a8fcd05ad9418ebd Mon Sep 17 00:00:00 2001 From: Arthur LAURENT Date: Wed, 21 May 2025 02:09:14 +0200 Subject: [PATCH 2/3] (C++ modules support) add clang-cl to C++ modules tests --- tests/projects/c++/modules/test_base.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/projects/c++/modules/test_base.lua b/tests/projects/c++/modules/test_base.lua index f060cfa0c9b..3f05281f379 100644 --- a/tests/projects/c++/modules/test_base.lua +++ b/tests/projects/c++/modules/test_base.lua @@ -127,6 +127,9 @@ function run_tests(clang_options, gcc_options, msvc_options) if clang_options then build_tests("llvm", clang_options) build_tests("clang", clang_options) + local clang_cl_options = table.clone(clang_options) + clang_cl_options.compiler = "clang-cl" + build_tests("clang-cl", clang_cl_options) if not clang_options.stdmodule then build_tests("llvm", clang_libcpp_options) build_tests("clang", clang_libcpp_options) From 481ada9f541be6754801d36bd03c84e7b8665b58 Mon Sep 17 00:00:00 2001 From: Arthur LAURENT Date: Thu, 22 May 2025 08:51:48 +0200 Subject: [PATCH 3/3] (C++ modules support) fix clang-cl --- tests/projects/c++/modules/hello_with_pch/test.lua | 12 ++++++++++++ tests/projects/c++/modules/test_base.lua | 12 ++++++++---- xmake/rules/c++/modules/clang/builder.lua | 4 +++- xmake/rules/c++/modules/scanner.lua | 14 ++++++++++++-- 4 files changed, 35 insertions(+), 7 deletions(-) diff --git a/tests/projects/c++/modules/hello_with_pch/test.lua b/tests/projects/c++/modules/hello_with_pch/test.lua index 7717f804997..033d2882c1d 100644 --- a/tests/projects/c++/modules/hello_with_pch/test.lua +++ b/tests/projects/c++/modules/hello_with_pch/test.lua @@ -1 +1,13 @@ inherit(".test_base") + +CLANG_MIN_VER = "17" +GCC_MIN_VER = "11" +MSVC_MIN_VER = "14.29" + +function main(_) + -- clang-cl doesn't support mixing pch and C++ module atm + local clang_options = {compiler = "clang", version = CLANG_MIN_VER, disable_clang_cl = true} + local gcc_options = {compiler = "gcc", version = GCC_MIN_VER} + local msvc_options = {version = MSVC_MIN_VER} + run_tests(clang_options, gcc_options, msvc_options) +end diff --git a/tests/projects/c++/modules/test_base.lua b/tests/projects/c++/modules/test_base.lua index 3f05281f379..0f030e0656e 100644 --- a/tests/projects/c++/modules/test_base.lua +++ b/tests/projects/c++/modules/test_base.lua @@ -4,6 +4,7 @@ import("core.tool.toolchain") import("utils.ci.is_running", {alias = "ci_is_running"}) CLANG_MIN_VER = "17" +CLANG_CL_MIN_VER = "19" GCC_MIN_VER = "11" MSVC_MIN_VER = "14.29" @@ -83,7 +84,7 @@ function build_tests(toolchain_name, opt) wprint(version_str .. "not found, skipping tests") return end - + local policies = "--policies=build.c++.modules.std:" .. (opt.stdmodule and "y" or "n") policies = policies .. ",build.c++.modules.fallbackscanner:" .. (opt.fallbackscanner and "y" or "n") @@ -127,9 +128,12 @@ function run_tests(clang_options, gcc_options, msvc_options) if clang_options then build_tests("llvm", clang_options) build_tests("clang", clang_options) - local clang_cl_options = table.clone(clang_options) - clang_cl_options.compiler = "clang-cl" - build_tests("clang-cl", clang_cl_options) + if not clang_options.disable_clang_cl then + local clang_cl_options = table.clone(clang_options) + clang_cl_options.compiler = "clang-cl" + clang_cl_options.version = CLANG_CL_MIN_VER + build_tests("clang-cl", clang_cl_options) + end if not clang_options.stdmodule then build_tests("llvm", clang_libcpp_options) build_tests("clang", clang_libcpp_options) diff --git a/xmake/rules/c++/modules/clang/builder.lua b/xmake/rules/c++/modules/clang/builder.lua index 79716728301..17189b79037 100644 --- a/xmake/rules/c++/modules/clang/builder.lua +++ b/xmake/rules/c++/modules/clang/builder.lua @@ -40,6 +40,9 @@ function _make_modulebuildflags(target, module, opt) flags = {"-x", "c++-module"} if not opt.objectfile then table.insert(flags, "--precompile") + if target:has_tool("cxx", "clang_cl") then + table.join2(flags, "/clang:-o", "/clang:" .. module.bmifile) + end end local std = (module.name == "std" or module.name == "std.compat") if std then @@ -182,7 +185,6 @@ function _get_requiresflags(target, module) end end requiresflags = table.unique(requiresflags) - -- table.sort(requiresflags) support.memcache():set2(cachekey, "requiresflags", requiresflags) support.memcache():set2(cachekey, "oldrequires", requires) end diff --git a/xmake/rules/c++/modules/scanner.lua b/xmake/rules/c++/modules/scanner.lua index 9e95f3cfdfd..537fb91d940 100644 --- a/xmake/rules/c++/modules/scanner.lua +++ b/xmake/rules/c++/modules/scanner.lua @@ -389,7 +389,12 @@ function _patch_sourcebatch(target, sourcebatch) local can_reuse = nocheck or _are_flags_compatible(target, dep, sourcefile, {strict = strict}) if can_reuse then - support.set_reused(target, dep, sourcefile) + local _reused, from = support.is_reused(dep, sourcefile) + if _reused then + support.set_reused(target, from, sourcefile) + else + support.set_reused(target, dep, sourcefile) + end table.insert(reused, sourcefile) if dep:is_moduleonly() then dep:data_set("cxx.modules.reused", true) @@ -417,10 +422,15 @@ function _patch_sourcebatch(target, sourcebatch) if reused:has(sourcefile) then local dep = target:dep(fileconfig.external) assert(dep, "dep target <%s> for <%s> not found", fileconfig.external, target:fullname()) + local _reused, from = support.is_reused(dep, sourcefile) + if _reused then + support.set_reused(target, from, sourcefile) + else + support.set_reused(target, dep, sourcefile) + end if dep:is_moduleonly() then dep:data_set("cxx.modules.reused", true) end - support.set_reused(target, dep, sourcefile) end target:fileconfig_add(sourcefile, fileconfig) end