Skip to content

Commit b8b616b

Browse files
committed
Merge remote-tracking branch 'intel/sycl' into steffen/deprecate_fallback_assert
2 parents 4c71a40 + 1dbfc10 commit b8b616b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+611
-678
lines changed

.github/workflows/ur-build-hw.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,6 @@ jobs:
144144
-DUR_DEVELOPER_MODE=ON
145145
-DUR_BUILD_TESTS=ON
146146
-DUR_BUILD_ADAPTER_${{matrix.adapter.name}}=ON
147-
-DUR_CONFORMANCE_TEST_LOADER=${{ matrix.adapter.other_name != '' && 'ON' || 'OFF' }}
148147
${{ matrix.adapter.other_name != '' && format('-DUR_BUILD_ADAPTER_{0}=ON', matrix.adapter.other_name) || '' }}
149148
-DUR_STATIC_LOADER=${{matrix.adapter.static_Loader}}
150149
-DUR_STATIC_ADAPTER_${{matrix.adapter.name}}=${{matrix.adapter.static_adapter}}
@@ -172,7 +171,8 @@ jobs:
172171
- name: Test adapters
173172
env:
174173
ZE_ENABLE_LOADER_DEBUG_TRACE: 1
175-
run: ctest -C ${{matrix.build_type}} --test-dir build --output-on-failure -L "conformance" --timeout 600 -VV
174+
LIT_OPTS: "--timeout 120"
175+
run: cmake --build build -j $(nproc) -- check-unified-runtime-conformance
176176

177177
- name: Get information about platform
178178
if: ${{ always() }}

libclc/libspirv/include/libspirv/atomic/atomic_xchg.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9+
#define __SPIRV_FUNCTION __spirv_AtomicExchange
910
#define __SPIRV_FUNCTION_S __spirv_AtomicExchange
1011
#define __SPIRV_FUNCTION_U __spirv_AtomicExchange
1112
#define __SPIRV_INT64_BASE

sycl/include/sycl/ext/oneapi/experimental/enqueue_functions.hpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ template <typename LCRangeT, typename LCPropertiesT> struct LaunchConfigAccess {
9797
};
9898

9999
template <typename CommandGroupFunc, typename PropertiesT>
100-
void submit_impl(queue &Q, PropertiesT Props, CommandGroupFunc &&CGF,
100+
void submit_impl(const queue &Q, PropertiesT Props, CommandGroupFunc &&CGF,
101101
const sycl::detail::code_location &CodeLoc) {
102102
#ifdef __INTEL_PREVIEW_BREAKING_CHANGES
103103
Q.submit_without_event(Props, detail::type_erased_cgfo_ty{CGF}, CodeLoc);
@@ -108,7 +108,7 @@ void submit_impl(queue &Q, PropertiesT Props, CommandGroupFunc &&CGF,
108108
}
109109

110110
template <typename CommandGroupFunc, typename PropertiesT>
111-
event submit_with_event_impl(queue &Q, PropertiesT Props,
111+
event submit_with_event_impl(const queue &Q, PropertiesT Props,
112112
CommandGroupFunc &&CGF,
113113
const sycl::detail::code_location &CodeLoc) {
114114
#ifdef __INTEL_PREVIEW_BREAKING_CHANGES
@@ -122,34 +122,34 @@ event submit_with_event_impl(queue &Q, PropertiesT Props,
122122
} // namespace detail
123123

124124
template <typename CommandGroupFunc, typename PropertiesT>
125-
void submit(queue Q, PropertiesT Props, CommandGroupFunc &&CGF,
125+
void submit(const queue &Q, PropertiesT Props, CommandGroupFunc &&CGF,
126126
const sycl::detail::code_location &CodeLoc =
127127
sycl::detail::code_location::current()) {
128128
sycl::ext::oneapi::experimental::detail::submit_impl(
129129
Q, Props, std::forward<CommandGroupFunc>(CGF), CodeLoc);
130130
}
131131

132132
template <typename CommandGroupFunc>
133-
void submit(queue Q, CommandGroupFunc &&CGF,
133+
void submit(const queue &Q, CommandGroupFunc &&CGF,
134134
const sycl::detail::code_location &CodeLoc =
135135
sycl::detail::code_location::current()) {
136-
submit(std::move(Q), empty_properties_t{},
137-
std::forward<CommandGroupFunc>(CGF), CodeLoc);
136+
submit(Q, empty_properties_t{}, std::forward<CommandGroupFunc>(CGF), CodeLoc);
138137
}
139138

140139
template <typename CommandGroupFunc, typename PropertiesT>
141-
event submit_with_event(queue Q, PropertiesT Props, CommandGroupFunc &&CGF,
140+
event submit_with_event(const queue &Q, PropertiesT Props,
141+
CommandGroupFunc &&CGF,
142142
const sycl::detail::code_location &CodeLoc =
143143
sycl::detail::code_location::current()) {
144144
return sycl::ext::oneapi::experimental::detail::submit_with_event_impl(
145145
Q, Props, std::forward<CommandGroupFunc>(CGF), CodeLoc);
146146
}
147147

148148
template <typename CommandGroupFunc>
149-
event submit_with_event(queue Q, CommandGroupFunc &&CGF,
149+
event submit_with_event(const queue &Q, CommandGroupFunc &&CGF,
150150
const sycl::detail::code_location &CodeLoc =
151151
sycl::detail::code_location::current()) {
152-
return submit_with_event(std::move(Q), empty_properties_t{},
152+
return submit_with_event(Q, empty_properties_t{},
153153
std::forward<CommandGroupFunc>(CGF), CodeLoc);
154154
}
155155

0 commit comments

Comments
 (0)