add icx toolchain

15 files changed, 471 insertions, 1 deletions

diff --git a/xmake/modules/core/tools/icpx.lua b/xmake/modules/core/tools/icpx.lua
new file mode 100644
index 000000000..6b5c3ab4e
--- /dev/null
+++ b/xmake/modules/core/tools/icpx.lua
@@ -0,0 +1,22 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015-present, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        icpc.lua
+--
+
+-- inherit icc
+inherit("icx")
diff --git a/xmake/modules/core/tools/icx.lua b/xmake/modules/core/tools/icx.lua
new file mode 100644
index 000000000..30a8800cb
--- /dev/null
+++ b/xmake/modules/core/tools/icx.lua
@@ -0,0 +1,22 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015-present, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        icc.lua
+--
+
+-- inherit gcc
+inherit("clang")
diff --git a/xmake/modules/detect/sdks/find_icxenv.lua b/xmake/modules/detect/sdks/find_icxenv.lua
new file mode 100644
index 000000000..55cd7d56e
--- /dev/null
+++ b/xmake/modules/detect/sdks/find_icxenv.lua
@@ -0,0 +1,55 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015-present, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        find_icxenv.lua
+--
+
+-- imports
+import("lib.detect.find_file")
+import("lib.detect.find_tool")
+
+-- find intel c/c++ envirnoment on windows
+function _find_intel_on_windows(opt)
+end
+
+-- find intel c/c++ envirnoment on linux
+function _find_intel_on_linux(opt)
+
+    -- attempt to find the sdk directory
+    local oneapi_rootdirs = {"~/intel/oneapi/compiler", "/opt/intel/oneapi/compiler"}
+    paths = {}
+    for _, rootdir in ipairs(oneapi_rootdirs) do
+        table.insert(paths, path.join(rootdir, "*", is_host("macosx") and "mac" or "linux", "bin"))
+    end
+    if #paths > 0 then
+        local icx = find_file("icx", paths)
+        if icx then
+            local bindir = path.directory(icx)
+            local sdkdir = path.directory(path.directory(bindir))
+            return {sdkdir = sdkdir, bindir = bindir}
+        end
+    end
+end
+
+-- find intel c/c++ environment
+function main(opt)
+    if is_host("windows") then
+        return _find_intel_on_windows(opt)
+    else
+        return _find_intel_on_linux(opt)
+    end
+end
diff --git a/xmake/modules/detect/tools/find_icpx.lua b/xmake/modules/detect/tools/find_icpx.lua
new file mode 100644
index 000000000..ebf892b8d
--- /dev/null
+++ b/xmake/modules/detect/tools/find_icpx.lua
@@ -0,0 +1,52 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015-present, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        find_icpc.lua
+--
+
+-- imports
+import("lib.detect.find_program")
+import("lib.detect.find_programver")
+
+-- find icpc
+--
+-- @param opt   the argument options, e.g. {version = true}
+--
+-- @return      program, version
+--
+-- @code
+--
+-- local icpc = find_icpc()
+-- local icpc, version, hintname = find_icpc({program = "icpc", version = true})
+--
+-- @endcode
+--
+function main(opt)
+
+    -- init options
+    opt = opt or {}
+
+    -- find program
+    local program = find_program(opt.program or "icpx", opt)
+
+    -- find program version
+    local version = nil
+    if program and opt.version then
+        version = find_programver(program, opt)
+    end
+    return program, version
+end
diff --git a/xmake/modules/detect/tools/find_icx.lua b/xmake/modules/detect/tools/find_icx.lua
new file mode 100644
index 000000000..1d70a2967
--- /dev/null
+++ b/xmake/modules/detect/tools/find_icx.lua
@@ -0,0 +1,52 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015-present, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        find_icc.lua
+--
+
+-- imports
+import("lib.detect.find_program")
+import("lib.detect.find_programver")
+
+-- find icc
+--
+-- @param opt   the argument options, e.g. {version = true}
+--
+-- @return      program, version
+--
+-- @code
+--
+-- local icc = find_icc()
+-- local icc, version, hintname = find_icc({program = "icc", version = true})
+--
+-- @endcode
+--
+function main(opt)
+
+    -- init options
+    opt = opt or {}
+
+    -- find program
+    local program = find_program(opt.program or "icx", opt)
+
+    -- find program version
+    local version = nil
+    if program and opt.version then
+        version = find_programver(program, opt)
+    end
+    return program, version
+end
diff --git a/xmake/modules/detect/tools/icpx/features.lua b/xmake/modules/detect/tools/icpx/features.lua
new file mode 100644
index 000000000..e9dc9ae44
--- /dev/null
+++ b/xmake/modules/detect/tools/icpx/features.lua
@@ -0,0 +1,23 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015-present, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        features.lua
+--
+
+-- imports
+inherit("detect.tools.clang.features")
+
diff --git a/xmake/modules/detect/tools/icpx/has_flags.lua b/xmake/modules/detect/tools/icpx/has_flags.lua
new file mode 100644
index 000000000..d8c6f2792
--- /dev/null
+++ b/xmake/modules/detect/tools/icpx/has_flags.lua
@@ -0,0 +1,23 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015-present, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        has_flags.lua
+--
+
+-- imports
+inherit("detect.tools.clang.has_flags")
+
diff --git a/xmake/modules/detect/tools/icx/cfeatures.lua b/xmake/modules/detect/tools/icx/cfeatures.lua
new file mode 100644
index 000000000..161f91c05
--- /dev/null
+++ b/xmake/modules/detect/tools/icx/cfeatures.lua
@@ -0,0 +1,22 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015-present, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        cfeatures.lua
+--
+
+-- imports
+import("detect.tools.clang.cfeatures")
diff --git a/xmake/modules/detect/tools/icx/cxxfeatures.lua b/xmake/modules/detect/tools/icx/cxxfeatures.lua
new file mode 100644
index 000000000..cf7f8d08e
--- /dev/null
+++ b/xmake/modules/detect/tools/icx/cxxfeatures.lua
@@ -0,0 +1,22 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015-present, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        cxxfeatures.lua
+--
+
+-- imports
+import("detect.tools.clang.cxxfeatures")
diff --git a/xmake/modules/detect/tools/icx/features.lua b/xmake/modules/detect/tools/icx/features.lua
new file mode 100644
index 000000000..e54887f71
--- /dev/null
+++ b/xmake/modules/detect/tools/icx/features.lua
@@ -0,0 +1,22 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015-present, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        features.lua
+--
+
+-- imports
+inherit("detect.tools.clang.features")
diff --git a/xmake/modules/detect/tools/icx/has_flags.lua b/xmake/modules/detect/tools/icx/has_flags.lua
new file mode 100644
index 000000000..d8c6f2792
--- /dev/null
+++ b/xmake/modules/detect/tools/icx/has_flags.lua
@@ -0,0 +1,23 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015-present, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        has_flags.lua
+--
+
+-- imports
+inherit("detect.tools.clang.has_flags")
+
diff --git a/xmake/toolchains/icc/xmake.lua b/xmake/toolchains/icc/xmake.lua
index a366f8761..1e90cb54d 100644
--- a/xmake/toolchains/icc/xmake.lua
+++ b/xmake/toolchains/icc/xmake.lua
@@ -22,7 +22,7 @@
 toolchain("icc")
 
     -- set homepage
-    set_homepage("https://software.intel.com/content/www/us/en/develop/tools/compilers/c-compilers.html")
+    set_homepage("https://www.intel.com/content/www/us/en/developer/tools/oneapi/dpc-compiler.html")
     set_description("Intel C/C++ Compiler")
 
     -- mark as standalone toolchain
diff --git a/xmake/toolchains/icx/check.lua b/xmake/toolchains/icx/check.lua
new file mode 100644
index 000000000..4d627915b
--- /dev/null
+++ b/xmake/toolchains/icx/check.lua
@@ -0,0 +1,46 @@
+--!A cross-toolchain build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015-present, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        check.lua
+--
+
+-- imports
+import("core.base.option")
+import("core.project.config")
+import("detect.sdks.find_icxenv")
+import("lib.detect.find_tool")
+
+-- main entry
+function main(toolchain)
+    local icxenv = toolchain:config("icxenv")
+    if icxenv then
+        return true
+    end
+    icxenv = find_icxenv()
+    if icxenv then
+        local tool = find_tool("icx", {force = true, paths = icxenv.bindir})
+        if tool then
+            cprint("checking for Intel LLVM C/C++ Compiler (%s) ... ${color.success}${text.success}", toolchain:arch())
+            toolchain:config_set("icxenv", icxenv)
+            toolchain:config_set("bindir", icxenv.bindir)
+            toolchain:configs_save()
+            return true
+        end
+        return true
+    end
+end
+
diff --git a/xmake/toolchains/icx/load.lua b/xmake/toolchains/icx/load.lua
new file mode 100644
index 000000000..4608c15ae
--- /dev/null
+++ b/xmake/toolchains/icx/load.lua
@@ -0,0 +1,51 @@
+--!A cross-toolchain build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015-present, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        load.lua
+--
+
+-- imports
+import("core.base.option")
+import("core.project.config")
+
+-- main entry
+function main(toolchain)
+
+    -- set toolset
+    toolchain:set("toolset", "cc", "icx")
+    toolchain:set("toolset", "cxx", "icpx", "icx")
+    toolchain:set("toolset", "ld", "icpx", "icx")
+    toolchain:set("toolset", "sh", "icpx", "icx")
+    toolchain:set("toolset", "ar", "ar")
+    toolchain:set("toolset", "strip", "strip")
+    toolchain:set("toolset", "as", "icx")
+
+    -- add march flags
+    local march
+    if toolchain:is_arch("x86_64", "x64") then
+        march = "-m64"
+    elseif toolchain:is_arch("i386", "x86") then
+        march = "-m32"
+    end
+    if march then
+        toolchain:add("cxflags", march)
+        toolchain:add("asflags", march)
+        toolchain:add("ldflags", march)
+        toolchain:add("shflags", march)
+    end
+end
+
diff --git a/xmake/toolchains/icx/xmake.lua b/xmake/toolchains/icx/xmake.lua
new file mode 100644
index 000000000..d853d2b9c
--- /dev/null
+++ b/xmake/toolchains/icx/xmake.lua
@@ -0,0 +1,35 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015-present, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        xmake.lua
+--
+
+-- define toolchain
+toolchain("icx")
+
+    -- set homepage
+    set_homepage("https://www.intel.com/content/www/us/en/developer/tools/oneapi/dpc-compiler.html")
+    set_description("Intel LLVM C/C++ Compiler")
+
+    -- mark as standalone toolchain
+    set_kind("standalone")
+
+    -- check toolchain
+    on_check("check")
+
+    -- on load
+    on_load("load")