Skip to content

DO NOT MERGE: CI TESTING #18664

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: sycl
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ur-build-hw.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ jobs:
static_adapter: "${{inputs.static_loader}}"
}
]
build_type: [Release]
build_type: [Debug]
compiler: [{c: gcc, cxx: g++}]

runs-on: ${{inputs.runner_name}}
Expand Down
28 changes: 2 additions & 26 deletions .github/workflows/ur-precommit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,47 +48,23 @@ jobs:

adapters:
name: Adapters
needs: [detect_changes, source_checks]
if: ${{ always() && !cancelled() && contains(needs.detect_changes.outputs.filters, 'ur') }}
needs: []
if: ${{ always() }}
strategy:
fail-fast: false
matrix:
# Extra native CPU jobs are here to force the loader to be used.
# UR will not use the loader if there is only one target.
include:
- name: L0
runner: UR_L0
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
- name: L0_V2
runner: UR_L0
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
- name: L0
runner: UR_L0
static: ON
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
- name: L0
runner: UR_L0
other_adapter: NATIVE_CPU
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
- name: HIP
runner: UR_HIP
image_options: -u 1001 --device=/dev/dri --device=/dev/kfd --cap-add=SYS_ADMIN
- name: CUDA
runner: UR_CUDA
image_options: -u 1001 --privileged --cap-add SYS_ADMIN --gpus all
- name: OPENCL
runner: UR_OPENCL
docker_image: "ghcr.io/intel/llvm/ubuntu2204_build:latest"
image_options: -u 1001 --device=/dev/dri --device=/dev/kfd --privileged --cap-add SYS_ADMIN
- name: OPENCL
runner: UR_OPENCL
other_adapter: NATIVE_CPU
docker_image: "ghcr.io/intel/llvm/ubuntu2204_build:latest"
image_options: -u 1001 --device=/dev/dri --device=/dev/kfd --privileged --cap-add SYS_ADMIN
- name: NATIVE_CPU
runner: UR_NATIVE_CPU
docker_image: "ghcr.io/intel/llvm/ubuntu2204_build:latest"
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
uses: ./.github/workflows/ur-build-hw.yml
with:
adapter_name: ${{ matrix.name }}
Expand Down
4 changes: 2 additions & 2 deletions unified-runtime/source/adapters/native_cpu/common.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
#include "ur/ur.hpp"
#include <chrono>

constexpr size_t MaxMessageSize = 256;
constexpr size_t MaxMessageSize = 512;

extern thread_local int32_t ErrorMessageCode;
extern thread_local char ErrorMessage[MaxMessageSize];

#define DIE_NO_IMPLEMENTATION \
do { \
UR_LOG(ERR, "Not Implemented : {}", __FUNCTION__) \
/*UR_LOG(ERR, "Not Implemented : {}", __FUNCTION__) */\
return UR_RESULT_ERROR_UNSUPPORTED_FEATURE; \
} while (false)

Expand Down
5 changes: 4 additions & 1 deletion unified-runtime/source/adapters/native_cpu/device.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,8 @@ UR_APIEXPORT ur_result_t UR_APICALL urDeviceGetInfo(ur_device_handle_t hDevice,
UR_ASSERT(hDevice, UR_RESULT_ERROR_INVALID_NULL_HANDLE);
UrReturnHelper ReturnValue(propSize, pPropValue, pPropSizeRet);

std::cout << ".. Native CPU deviceGetInfo has been hit\n";

switch (static_cast<uint32_t>(propName)) {
case UR_DEVICE_INFO_TYPE:
return ReturnValue(UR_DEVICE_TYPE_CPU);
Expand Down Expand Up @@ -456,7 +458,8 @@ UR_APIEXPORT ur_result_t UR_APICALL urDeviceGetInfo(ur_device_handle_t hDevice,
return ReturnValue(false);

default:
DIE_NO_IMPLEMENTATION;
std::cout << ".. Native CPU deviceGetInfo is dying...\n";
return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
}
return UR_RESULT_SUCCESS;
}
Expand Down
2 changes: 2 additions & 0 deletions unified-runtime/source/loader/layers/tracing/ur_trcddi.cpp

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 8 additions & 1 deletion unified-runtime/source/loader/ur_ldrddi.cpp

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion unified-runtime/tools/urinfo/utils.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

#define UR_CHECK_WEAK(ACTION) \
if (auto error = ACTION) { \
std::cout << error << "\n"; \
std::cout << "!!!" << "\n"; \
return; \
} \
(void)0
Expand Down Expand Up @@ -213,6 +213,7 @@ inline void printDeviceInfo<ur_bool_t>(ur_device_handle_t device,
ur_bool_t value;
UR_CHECK_WEAK(
urDeviceGetInfo(device, info, sizeof(ur_bool_t), &value, nullptr));
std::cout << ".. value get\n";
std::string result = value ? "true" : "false";
std::cout << result << "\n";
}
Expand Down
Loading