Commit eb637d10 authored by Kumar Gala's avatar Kumar Gala Committed by Kumar Gala
Browse files

toolchain: oneApi: Fix support and update for 2023.0.0 release 

The oneApi support has bit rotten since it was first introduced.  Update
the support to function with the latest 2023.0.0 release and add a
check to only support that version or newer for now.  Versions before
2021.2.0 have linker script failures.

Various fixes made:
* In the 2023.0.0 release, various binaries are in a llvm-bin path so
  add support to search in that path.  This replaces the python search
  path that much older versions needed.
* newlib isn't supported with oneApi so set TOOLCHAIN_HAS_NEWLIB to
  OFF to match that.
* 2023.0.0 doesn't back llvm-nm, so use binutils version.  This
  is expected to be fixed in 2023.1.0 release so add a check to
  handle either case.
* Update compiler flag check based on clang to also support
  CMAKE_C_COMPILER_ID of "IntelLLVM" as that is how the oneApi toolchain
  reports itself.

Signed-off-by: default avatarKumar Gala <kumar.gala@intel.com>
(cherry picked from commit 2d12766e)
parent 7ccd0340

CMakeLists.txt

+2 −1
Changes for CMakeLists.txt: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -391,7 +391,8 @@ zephyr_compile_options(${COMPILER_OPT_AS_LIST}) 


# TODO: Include arch compiler options at this point.



if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang")

if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang" AND

   NOT CMAKE_C_COMPILER_ID STREQUAL "IntelLLVM")

  # GCC assumed

  zephyr_cc_option(-fno-reorder-functions)

cmake/bintools/oneApi/target.cmake

+7 −1
Changes for cmake/bintools/oneApi/target.cmake: 7 added lines, 1 removed line.
Original line number Diff line number Diff line 
# SPDX-License-Identifier: Apache-2.0



if(DEFINED TOOLCHAIN_HOME)

  set(find_program_clang_args PATHS ${TOOLCHAIN_HOME} ${ONEAPI_PYTHON_PATH} NO_DEFAULT_PATH)

  set(find_program_clang_args PATHS ${TOOLCHAIN_HOME} ${ONEAPI_LLVM_BIN_PATH} NO_DEFAULT_PATH)

  set(find_program_binutils_args PATHS ${TOOLCHAIN_HOME} )

endif()



find_package(oneApi 2023.0.0 REQUIRED)



find_program(CMAKE_AR      llvm-ar      ${find_program_clang_args}   )

if(ONEAPI_VERSION VERSION_LESS_EQUAL "2023.0.0")

  find_program(CMAKE_NM      nm           ${find_program_binutils_args}   )

else()

  find_program(CMAKE_NM      llvm-nm      ${find_program_clang_args}   )

endif()

# In OneApi installation directory on Windows, there is no llvm-objdump

# binary, so would better use objdump from system environment both

# on Linux and Windows.

cmake/modules/FindoneApi.cmake

0 → 100644
+24 −0
Changes for cmake/modules/FindoneApi.cmake: 24 added lines, 0 removed lines.
Original line number Diff line number Diff line 
# SPDX-License-Identifier: Apache-2.0

#

# Copyright (c) 2023 Intel Corporation

#

# FindoneApi module for locating oneAPI compiler, icx.

#

# The module defines the following variables:

#

# 'oneApi_FOUND', 'ONEAPI_FOUND'

# True if the oneApi toolchain/compiler, icx, was found.

#

# 'ONEAPI_VERSION'

# The version of the oneAPI toolchain.



if(CMAKE_C_COMPILER)

  # Parse the 'clang --version' output to find the installed version.

  execute_process(COMMAND ${CMAKE_C_COMPILER} --version OUTPUT_VARIABLE ONEAPI_VERSION)

  string(REGEX REPLACE "[^0-9]*([0-9.]+) .*" "\\1" ONEAPI_VERSION ${ONEAPI_VERSION})

endif()



find_package_handle_standard_args(oneApi

				  REQUIRED_VARS CMAKE_C_COMPILER

				  VERSION_VAR ONEAPI_VERSION

)

cmake/toolchain/oneApi/generic.cmake

+3 −1
Changes for cmake/toolchain/oneApi/generic.cmake: 3 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ endif() 
string(TOLOWER ${CMAKE_HOST_SYSTEM_NAME} system)

if(ONEAPI_TOOLCHAIN_PATH)

  set(TOOLCHAIN_HOME ${ONEAPI_TOOLCHAIN_PATH}/compiler/latest/${system}/bin/)

  set(ONEAPI_PYTHON_PATH ${ONEAPI_TOOLCHAIN_PATH}/intelpython/latest/bin)

  set(ONEAPI_LLVM_BIN_PATH ${ONEAPI_TOOLCHAIN_PATH}/compiler/latest/${system}/bin-llvm)

endif()



set(ONEAPI_TOOLCHAIN_PATH ${ONEAPI_TOOLCHAIN_PATH} CACHE PATH "oneApi install directory")
@@ -43,4 +43,6 @@ elseif(system STREQUAL "windows") 
  add_link_options(--target=${triple})

endif()



set(TOOLCHAIN_HAS_NEWLIB OFF CACHE BOOL "True if toolchain supports newlib")



message(STATUS "Found toolchain: host (clang/ld)")

CRA Git | Maintained and supported by SUSTech CRA and CCSE