support ispc compiler #3017
Merged
support ispc compiler #3017
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
waruqi
reviewed
Nov 4, 2022
tests/projects/other/ispc/xmake.lua
Outdated
| add_rules("utils.ispc", {header_extension = "_ispc.h"}) | ||
| add_files("src/*.ispc") | ||
| set_values("ispc.flags", "--target=host") | ||
| set_policy("build.across_targets_in_parallel", false) |
There was a problem hiding this comment.
why use object kind? Example projects should be as simple as possible
target("test")
set_kind("binary")
add_rules("utils.ispc", {header_extension = "_ispc.h"})
set_values("ispc.flags", "--target=host")
add_files("src/*.ispc")
add_files("src/*.cpp")
waruqi
reviewed
Nov 4, 2022
tests/projects/other/ispc/xmake.lua
Outdated
| @@ -0,0 +1,16 @@ | |||
| add_rules("mode.debug", "mode.release") | |||
|
|
|||
| includes("ispc.lua") | |||
waruqi
reviewed
Nov 4, 2022
xmake/rules/utils/ispc/ispc.lua
Outdated
| @@ -0,0 +1,77 @@ | |||
| rule("utils.ispc") | |||
| set_extensions(".ispc") | |||
| add_deps("utils.inherit.links") | |||
waruqi
reviewed
Nov 4, 2022
xmake/rules/utils/ispc/ispc.lua
Outdated
| on_load(function (target) | ||
| local header_outputdir = path.join(target:autogendir(), "ispc_headers") | ||
| local obj_outputdir = path.join(target:autogendir(), "ispc_objs") | ||
| os.mkdir(target:autogendir()) |
There was a problem hiding this comment.
we should use batchcmds:mkdir in before_buildcmd_file, only obj_outputdir need be create here
waruqi
reviewed
Nov 4, 2022
xmake/rules/utils/ispc/ispc.lua
Outdated
| before_buildcmd_file(function (target, batchcmds, sourcefile_ispc, opt) | ||
| import("lib.detect.find_tool") | ||
| ispc = find_tool("ispc") | ||
| assert(ispc, "ispc not found!") |
There was a problem hiding this comment.
missing local keyword
local ispc = assert(find_tool("ispc"), "ispc not found!")
waruqi
reviewed
Nov 4, 2022
xmake/rules/utils/ispc/ispc.lua
Outdated
| header_file = path.join(header_outputdir, path.filename(sourcefile_ispc) .. ".h") | ||
| end | ||
|
|
||
| batchcmds:show_progress(opt.progress, "${color.build.object}cache compiling %s", sourcefile_ispc) |
There was a problem hiding this comment.
remove cache prefix
"${color.build.object}cache compiling.ispc %s"
waruqi
reviewed
Nov 4, 2022
xmake/rules/utils/ispc/ispc.lua
Outdated
|
|
||
| local header_outputdir = path.join(target:autogendir(), "ispc_headers") | ||
| local obj_outputdir = path.join(target:autogendir(), "ispc_objs") | ||
| local obj_file = path.join(obj_outputdir, path.filename(sourcefile_ispc) .. obj_extension) |
waruqi
reviewed
Nov 4, 2022
xmake/rules/utils/ispc/ispc.lua
Outdated
| end | ||
|
|
||
| local header_outputdir = path.join(target:autogendir(), "ispc_headers") | ||
| local obj_outputdir = path.join(target:autogendir(), "ispc_objs") |
waruqi
reviewed
Nov 4, 2022
xmake/rules/utils/ispc/ispc.lua
Outdated
| obj_extension = ".obj" | ||
| end | ||
|
|
||
| local header_outputdir = path.join(target:autogendir(), "ispc_headers") |
waruqi
reviewed
Nov 4, 2022
xmake/rules/utils/ispc/ispc.lua
Outdated
| batchcmds:vrunv(ispc.program, table.join2(flags, | ||
| {"-o", obj_file, | ||
| "-h", header_file, | ||
| path.join(os.projectdir(), sourcefile_ispc)})) |
There was a problem hiding this comment.
why not use sourcefile_ispc directly
waruqi
reviewed
Nov 4, 2022
xmake/rules/utils/ispc/ispc.lua
Outdated
| batchcmds:show_progress(opt.progress, "${color.build.object}cache compiling %s", sourcefile_ispc) | ||
| batchcmds:vrunv(ispc.program, table.join2(flags, | ||
| {"-o", obj_file, | ||
| "-h", header_file, |
There was a problem hiding this comment.
you need use path(headerfile) to wrap it for supporting project generator.
waruqi
reviewed
Nov 4, 2022
xmake/rules/utils/ispc/ispc.lua
Outdated
|
|
||
| batchcmds:show_progress(opt.progress, "${color.build.object}cache compiling %s", sourcefile_ispc) | ||
| batchcmds:vrunv(ispc.program, table.join2(flags, | ||
| {"-o", obj_file, |
waruqi
reviewed
Nov 4, 2022
xmake/rules/utils/ispc/ispc.lua
Outdated
| end | ||
|
|
||
| batchcmds:show_progress(opt.progress, "${color.build.object}cache compiling %s", sourcefile_ispc) | ||
| batchcmds:vrunv(ispc.program, table.join2(flags, |
There was a problem hiding this comment.
please use table.insert to insert flags first. it will avoid once object copy.
waruqi
reviewed
Nov 4, 2022
xmake/rules/utils/ispc/ispc.lua
Outdated
| batchcmds:set_depmtime(os.mtime(obj_file)) | ||
| batchcmds:set_depcache(target:dependfile(obj_file)) | ||
| batchcmds:set_depmtime(os.mtime(header_file)) | ||
| batchcmds:set_depcache(target:dependfile(header_file)) |
There was a problem hiding this comment.
duplicate set_depmtime and set_depcache, you can only set once
waruqi
reviewed
Nov 4, 2022
xmake/rules/utils/ispc/ispc.lua
Outdated
| set_extensions(".ispc") | ||
|
|
||
| on_load(function (target) | ||
| local header_outputdir = path.join(target:autogendir(), "ispc_headers") |
There was a problem hiding this comment.
local headersdir = path.join(target:autogendir(), "rules", "utils", "ispc", "headers")
waruqi
reviewed
Nov 4, 2022
xmake/rules/utils/ispc/ispc.lua
Outdated
| table.insert(flags, "-h") | ||
| table.insert(flags, path(headersfile)) | ||
| table.insert(flags, path(sourcefile_ispc)) | ||
| batchcmds:show_progress(opt.progress, "${color.build.object}compiling %s", sourcefile_ispc) |
waruqi
reviewed
Nov 4, 2022
xmake/rules/utils/ispc/ispc.lua
Outdated
| obj_extension = ".obj" | ||
| end | ||
|
|
||
| local headersdir = path.join(target:autogendir(), "ispc_headers") |
There was a problem hiding this comment.
local headersdir = path.join(target:autogendir(), "rules", "utils", "ispc", "headers")
waruqi
reviewed
Nov 4, 2022
xmake/rules/utils/ispc/ispc.lua
Outdated
| end | ||
|
|
||
| local headersdir = path.join(target:autogendir(), "ispc_headers") | ||
| local objectdir = path.join(target:autogendir(), "ispc_objs") |
waruqi
reviewed
Nov 4, 2022
xmake/rules/utils/ispc/ispc.lua
Outdated
|
|
||
| local headersdir = path.join(target:autogendir(), "ispc_headers") | ||
| local objectdir = path.join(target:autogendir(), "ispc_objs") | ||
| local objectfile = path.join(objectdir, path.filename(sourcefile_ispc) .. obj_extension) |
There was a problem hiding this comment.
local objectfile = target:objectfile(sourcefile_ispc)
waruqi
reviewed
Nov 4, 2022
xmake/rules/utils/ispc/ispc.lua
Outdated
|
|
||
| local headersdir = path.join(target:autogendir(), "rules", "utils", "ispc", "headers") | ||
| local objectdir = path.join(target:autogendir(), "rules", "utils", "ispc", "objs") | ||
| local objectfile = path.join(objectdir, path.filename(target:objectfile(sourcefile_ispc))) |
There was a problem hiding this comment.
local objectfile = target:objectfile(sourcefile_ispc)
local objectdir = path.directory(objectfile)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.