From ec388628338be4dbfadd3ee499556f82c54d4ff7 Mon Sep 17 00:00:00 2001 From: Arthur LAURENT Date: Thu, 1 Dec 2022 12:29:56 +0100 Subject: compile privates module en gcc --- xmake/rules/c++/modules/modules_support/gcc.lua | 158 ++++++++++++++++-------- 1 file changed, 107 insertions(+), 51 deletions(-) (limited to 'xmake/rules/c++/modules/modules_support/gcc.lua') diff --git a/xmake/rules/c++/modules/modules_support/gcc.lua b/xmake/rules/c++/modules/modules_support/gcc.lua index dbb8df3bf..53127c6da 100644 --- a/xmake/rules/c++/modules/modules_support/gcc.lua +++ b/xmake/rules/c++/modules/modules_support/gcc.lua @@ -94,7 +94,7 @@ function _get_toolchain_includedirs_for_stlheaders(includedirs, gcc) os.tryrm(tmpfile) end --- build module file +-- build interface module file function _build_modulefile(target, sourcefile, opt) local objectfile = opt.objectfile local dependfile = opt.dependfile @@ -110,6 +110,39 @@ function _build_modulefile(target, sourcefile, opt) return end + -- trace + progress.show(opt.progress, "${color.build.object}build.cxx.module %s", sourcefile) + vprint(compinst:compcmd(sourcefile, objectfile, {compflags = compflags, rawargs = true})) + + if not dryrun then + + -- do compile + dependinfo.files = {} + assert(compinst:compile(sourcefile, objectfile, {dependinfo = dependinfo, compflags = compflags})) + + -- update files and values to the dependent file + dependinfo.values = depvalues + table.join2(dependinfo.files, sourcefile) + depend.save(dependinfo, dependfile) + end +end + +-- build interface module file +function _build_interfacemodulefile(target, sourcefile, opt) + local objectfile = opt.objectfile + local dependfile = opt.dependfile + local compinst = compiler.load("cxx", {target = target}) + local compflags = table.join("-x", "c++", compinst:compflags({target = target})) + local dependinfo = option.get("rebuild") and {} or (depend.load(dependfile) or {}) + + -- need build this object? + local dryrun = option.get("dry-run") + local depvalues = {compinst:program(), compflags} + local lastmtime = os.isfile(objectfile) and os.mtime(dependfile) or 0 + if not dryrun and not depend.is_changed(dependinfo, {lastmtime = lastmtime, values = depvalues}) then + return + end + -- trace progress.show(opt.progress, "${color.build.object}generating.cxx.module.bmi %s", opt.name) vprint(compinst:compcmd(sourcefile, objectfile, {compflags = compflags, rawargs = true})) @@ -356,43 +389,58 @@ function build_modules_for_batchjobs(target, batchjobs, objectfiles, modules, op -- build modules local projectdir = os.projectdir() - local provided_modules = {} + local modulesjobs = {} for _, objectfile in ipairs(objectfiles) do local m = modules[objectfile] - if m and m.provides then - -- assume there that provides is only one, until we encounter the case - local length = 0 - local name, provide - for k, v in pairs(m.provides) do - length = length + 1 - name = k - provide = v - if length > 1 then - raise("multiple provides are not supported now!") + if m then + if m.provides then + -- assume there that provides is only one, until we encounter the case + local length = 0 + local name, provide + for k, v in pairs(m.provides) do + length = length + 1 + name = k + provide = v + if length > 1 then + raise("multiple provides are not supported now!") + end end - end - local bmifile = provide.bmi - local moduleinfo = table.copy(provide) - moduleinfo.job = batchjobs:newjob(provide.sourcefile, function (index, total) - _build_modulefile(target, provide.sourcefile, { - objectfile = objectfile, - dependfile = target:dependfile(bmifile), - name = name, - progress = (index * 100) / total}) - end) - if m.requires then - moduleinfo.deps = table.keys(m.requires) + local bmifile = provide.bmi + local moduleinfo = table.copy(provide) + moduleinfo.job = batchjobs:newjob(provide.sourcefile, function (index, total) + _build_interfacemodulefile(target, provide.sourcefile, { + objectfile = objectfile, + dependfile = target:dependfile(bmifile), + name = name, + progress = (index * 100) / total}) + end) + if m.requires then + moduleinfo.deps = table.keys(m.requires) + end + moduleinfo.name = name + modulesjobs[name] = moduleinfo + _add_module_to_mapper(mapper_file, name, path.absolute(bmifile, projectdir)) + target:add("objectfiles", objectfile) + elseif common.has_module_extension(m.cppfile) then + modulesjobs[m.cppfile] = { + name = m.cppfile, + deps = table.keys(m.requires or {}), + sourcefile = m.cppfile, + job = batchjobs:newjob(m.cppfile, function(index, total) + _build_modulefile(target, m.cppfile, { + objectfile = objectfile, + dependfile = target:dependfile(m.cppfile), + progress = (index * 100) / total}) + target:add("objectfiles", objectfile) + end) + } end - moduleinfo.name = name - provided_modules[name] = moduleinfo - _add_module_to_mapper(mapper_file, name, path.absolute(bmifile, projectdir)) - target:add("objectfiles", objectfile) end end -- build batchjobs for modules - common.build_batchjobs_for_modules(provided_modules, batchjobs, opt.rootjob) + common.build_batchjobs_for_modules(modulesjobs, batchjobs, opt.rootjob) end -- build module files for batchcmds @@ -407,30 +455,38 @@ function build_modules_for_batchcmds(target, batchcmds, objectfiles, modules, op local depmtime = 0 for _, objectfile in ipairs(objectfiles) do local m = modules[objectfile] - if m and m.provides then - -- assume there that provides is only one, until we encounter the case - local length = 0 - local name, provide - for k, v in pairs(m.provides) do - length = length + 1 - name = k - provide = v - if length > 1 then - raise("multiple provides are not supported now!") + if m then + if m.provides then + -- assume there that provides is only one, until we encounter the case + local length = 0 + local name, provide + for k, v in pairs(m.provides) do + length = length + 1 + name = k + provide = v + if length > 1 then + raise("multiple provides are not supported now!") + end end - end - - local bmifile = provide.bmi - local args = {"-o", path(objectfile), "-c", path(provide.sourcefile)} - batchcmds:show_progress(opt.progress, "${color.build.object}generating.cxx.module.bmi %s", name) - batchcmds:mkdir(path.directory(objectfile)) - batchcmds:vrunv(compinst:program(), table.join(compinst:compflags({target = target}), common_args, args)) - batchcmds:add_depfiles(provide.sourcefile) - _add_module_to_mapper(mapper_file, name, path.absolute(bmifile, projectdir)) - - target:add("objectfiles", objectfile) - depmtime = math.max(depmtime, os.mtime(bmifile)) + local bmifile = provide.bmi + local args = {"-o", path(objectfile), "-c", path(provide.sourcefile)} + batchcmds:show_progress(opt.progress, "${color.build.object}generating.cxx.module.bmi %s", name) + batchcmds:mkdir(path.directory(objectfile)) + batchcmds:vrunv(compinst:program(), table.join(compinst:compflags({target = target}), common_args, args)) + batchcmds:add_depfiles(provide.sourcefile) + _add_module_to_mapper(mapper_file, name, path.absolute(bmifile, projectdir)) + target:add("objectfiles", objectfile) + depmtime = math.max(depmtime, os.mtime(bmifile)) + elseif common.has_module_extension(m.cppfile) then + local args = {"-o", path(objectfile), "-c", path(m.cppfile)} + batchcmds:show_progress(opt.progress, "${color.build.object}build.cxx.module %s", m.cppfile) + batchcmds:mkdir(path.directory(objectfile)) + batchcmds:vrunv(compinst:program(), table.join(compinst:compflags({target = target}), args)) + batchcmds:add_depfiles(m.cppfile) + target:add("objectfiles", objectfile) + depmtime = math.max(depmtime, os.mtime(objectfile)) + end end end batchcmds:set_depmtime(depmtime) -- cgit v1.3.1 From 0760075dfdc49d14aaf122f9a232c6cb70f75263 Mon Sep 17 00:00:00 2001 From: Arthur LAURENT Date: Thu, 1 Dec 2022 15:09:37 +0100 Subject: fix comments --- xmake/rules/c++/modules/modules_support/clang.lua | 4 ++-- xmake/rules/c++/modules/modules_support/gcc.lua | 2 +- xmake/rules/c++/modules/modules_support/msvc.lua | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'xmake/rules/c++/modules/modules_support/gcc.lua') diff --git a/xmake/rules/c++/modules/modules_support/clang.lua b/xmake/rules/c++/modules/modules_support/clang.lua index fd7b4ca33..aae0e2aa5 100644 --- a/xmake/rules/c++/modules/modules_support/clang.lua +++ b/xmake/rules/c++/modules/modules_support/clang.lua @@ -133,7 +133,7 @@ function _get_toolchain_includedirs_for_stlheaders(target, includedirs, clang) os.tryrm(tmpfile) end --- build interface module file +-- build module file function _build_modulefile(target, sourcefile, opt) local objectfile = opt.objectfile local dependfile = opt.dependfile @@ -170,7 +170,7 @@ function _build_modulefile(target, sourcefile, opt) end end --- build module file +-- build interface module file function _build_interfacemodulefile(target, sourcefile, opt) local objectfile = opt.objectfile local dependfile = opt.dependfile diff --git a/xmake/rules/c++/modules/modules_support/gcc.lua b/xmake/rules/c++/modules/modules_support/gcc.lua index 53127c6da..78a56976e 100644 --- a/xmake/rules/c++/modules/modules_support/gcc.lua +++ b/xmake/rules/c++/modules/modules_support/gcc.lua @@ -94,7 +94,7 @@ function _get_toolchain_includedirs_for_stlheaders(includedirs, gcc) os.tryrm(tmpfile) end --- build interface module file +-- build module file function _build_modulefile(target, sourcefile, opt) local objectfile = opt.objectfile local dependfile = opt.dependfile diff --git a/xmake/rules/c++/modules/modules_support/msvc.lua b/xmake/rules/c++/modules/modules_support/msvc.lua index 0e4610c0e..ec59421c0 100644 --- a/xmake/rules/c++/modules/modules_support/msvc.lua +++ b/xmake/rules/c++/modules/modules_support/msvc.lua @@ -84,7 +84,7 @@ function _add_objectfile_to_link_arguments(target, objectfile) common.localcache():save(cachekey) end --- build interface module file +-- build module file function _build_modulefile(target, sourcefile, opt) local objectfile = opt.objectfile local dependfile = opt.dependfile -- cgit v1.3.1 From 4554eaf6b7aa25027c49803dc5288fdc272c3363 Mon Sep 17 00:00:00 2001 From: Arthur LAURENT Date: Thu, 1 Dec 2022 16:09:08 +0100 Subject: support incremental private module build --- xmake/rules/c++/modules/modules_support/clang.lua | 2 +- xmake/rules/c++/modules/modules_support/gcc.lua | 2 +- xmake/rules/c++/modules/modules_support/msvc.lua | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'xmake/rules/c++/modules/modules_support/gcc.lua') diff --git a/xmake/rules/c++/modules/modules_support/clang.lua b/xmake/rules/c++/modules/modules_support/clang.lua index aae0e2aa5..379aa517c 100644 --- a/xmake/rules/c++/modules/modules_support/clang.lua +++ b/xmake/rules/c++/modules/modules_support/clang.lua @@ -503,7 +503,7 @@ function build_modules_for_batchjobs(target, batchjobs, objectfiles, modules, op if common.has_module_extension(module.cppfile) then _build_modulefile(target, module.cppfile, { objectfile = objectfile, - dependfile = target:dependfile(module.cppfile), + dependfile = target:dependfile(objectfile), requiresflags = requiresflags, progress = (index * 100) / total}) target:add("objectfiles", objectfile) diff --git a/xmake/rules/c++/modules/modules_support/gcc.lua b/xmake/rules/c++/modules/modules_support/gcc.lua index 78a56976e..d02512e59 100644 --- a/xmake/rules/c++/modules/modules_support/gcc.lua +++ b/xmake/rules/c++/modules/modules_support/gcc.lua @@ -430,7 +430,7 @@ function build_modules_for_batchjobs(target, batchjobs, objectfiles, modules, op job = batchjobs:newjob(m.cppfile, function(index, total) _build_modulefile(target, m.cppfile, { objectfile = objectfile, - dependfile = target:dependfile(m.cppfile), + dependfile = target:dependfile(objectfile), progress = (index * 100) / total}) target:add("objectfiles", objectfile) end) diff --git a/xmake/rules/c++/modules/modules_support/msvc.lua b/xmake/rules/c++/modules/modules_support/msvc.lua index ec59421c0..d9f3019d6 100644 --- a/xmake/rules/c++/modules/modules_support/msvc.lua +++ b/xmake/rules/c++/modules/modules_support/msvc.lua @@ -509,7 +509,7 @@ function build_modules_for_batchjobs(target, batchjobs, objectfiles, modules, op if common.has_module_extension(module.cppfile) then _build_modulefile(target, module.cppfile, { objectfile = objectfile, - dependfile = target:dependfile(module.cppfile), + dependfile = target:dependfile(objectfile), requiresflags = requiresflags, progress = (index * 100) / total}) target:add("objectfiles", objectfile) -- cgit v1.3.1