Skip to content

[SYCLomatic] Fix incorrect test for texture types#2328

Merged
zhimingwang36 merged 6 commits intooneapi-src:SYCLomaticfrom
the-slow-one:6597_fix_cu_tr_enum_migration
Sep 5, 2024
Merged

[SYCLomatic] Fix incorrect test for texture types#2328
zhimingwang36 merged 6 commits intooneapi-src:SYCLomaticfrom
the-slow-one:6597_fix_cu_tr_enum_migration

Conversation

@the-slow-one
Copy link
Copy Markdown

@the-slow-one the-slow-one commented Sep 5, 2024 •
edited
Loading

https://github.com/oneapi-src/SYCLomatic/pull/2318/files breaks a LIT test due to incorrect CHECK directive. This PR fixes it.

@the-slow-one the-slow-one requested a review from a team as a code owner September 5, 2024 06:43
@the-slow-one
Copy link
Copy Markdown
Author

the-slow-one commented Sep 5, 2024 •
edited
Loading

Two LIT test fails

[2024-09-05T07:41:32.557Z] Failed Tests (2):
[2024-09-05T07:41:32.557Z]   Clang :: dpct/thrust_sort_by_key_usm.cu
[2024-09-05T07:41:32.557Z]   Clang :: dpct/thrust_stable_sort_by_key_usm.cu
[2024-09-05T07:41:32.557Z] 
[2024-09-05T07:41:32.557Z] 
[2024-09-05T07:41:32.557Z] Testing Time: 405.45s

The error message is unrelated to the changes in this PR.

[2024-09-05T07:35:13.828Z] In file included from /netbatch/donb59758_00/runDir/jenkins-dir/workspace/SYCLomatic_CI/Lit_Lin/c2s.src/build/tools/clang/test/dpct/Output/thrust_sort_by_key_usm/thrust_sort_by_key_usm.dp.cpp:7:
[2024-09-05T07:35:13.828Z] In file included from /nfs/sc/proj/icl/cmplrarch/comp/onedpl/linux/20240826/include/oneapi/dpl/execution:70:
[2024-09-05T07:35:13.828Z] In file included from /nfs/sc/proj/icl/cmplrarch/comp/onedpl/linux/20240826/include/oneapi/dpl/pstl/glue_execution_defs.h:55:
[2024-09-05T07:35:13.828Z] In file included from /nfs/sc/proj/icl/cmplrarch/comp/onedpl/linux/20240826/include/oneapi/dpl/pstl/hetero/algorithm_impl_hetero.h:22:
[2024-09-05T07:35:13.828Z] In file included from /nfs/sc/proj/icl/cmplrarch/comp/onedpl/linux/20240826/include/oneapi/dpl/pstl/hetero/../parallel_backend.h:32:
[2024-09-05T07:35:13.828Z] In file included from /nfs/sc/proj/icl/cmplrarch/comp/onedpl/linux/20240826/include/oneapi/dpl/pstl/hetero/../hetero/dpcpp/parallel_backend_sycl.h:47:
[2024-09-05T07:35:13.828Z] /nfs/sc/proj/icl/cmplrarch/comp/onedpl/linux/20240826/include/oneapi/dpl/pstl/hetero/../hetero/dpcpp/parallel_backend_sycl_radix_sort.h:208:67: error: definition with same mangled name '_ZTSN6oneapi3dpl20__par_backend_hetero10__internal11__compositeINS1_25__radix_sort_count_kernelILj4ELb0ELb0EJEEEJLc95ELc90ELc84ELc83ELc78ELc54ELc111ELc110ELc101ELc97ELc112ELc105ELc51ELc100ELc112ELc108ELc50ELc48ELc95ELc95ELc112ELc97ELc114ELc95ELc98ELc97ELc99ELc107ELc101ELc110ELc100ELc95ELc104ELc101ELc116ELc101ELc114ELc111ELc50ELc53ELc95ELc95ELc114ELc97ELc100ELc105ELc120ELc95ELc115ELc111ELc114ELc116ELc95ELc99ELc111ELc117ELc110ELc116ELc95ELc107ELc101ELc114ELc110ELc101ELc108ELc73ELc76ELc106ELc52ELc69ELc76ELc98ELc48ELc69ELc76ELc98ELc48ELc69ELc74ELc78ELc83ELc48ELc95ELc57ELc101ELc120ELc101ELc99ELc117ELc116ELc105ELc111ELc110ELc53ELc95ELc95ELc100ELc112ELc108ELc49ELc55ELc68ELc101ELc102ELc97ELc117ELc108ELc116ELc75ELc101ELc114ELc110ELc101ELc108ELc78ELc97ELc109ELc101ELc69ELc82ELc78ELc83ELc52ELc95ELc49ELc51ELc100ELc101ELc118ELc105ELc99ELc101ELc95ELc112ELc111ELc108ELc105ELc99ELc121ELc73ELc83ELc53ELc95ELc69ELc69ELc78ELc83ELc48ELc95ELc56ELc95ELc95ELc114ELc97ELc110ELc103ELc101ELc115ELc56ELc97ELc108ELc108ELc95ELc118ELc105ELc101ELc119ELc73ELc78ELc83ELc48ELc95ELc49ELc48ELc95ELc95ELc105ELc110ELc116ELc101ELc114ELc110ELc97ELc108ELc53ELc116ELc117ELc112ELc108ELc101ELc73ELc74ELc105ELc105ELc69ELc69ELc69ELc76ELc78ELc52ELc115ELc121ELc99ELc108ELc51ELc95ELc86ELc49ELc54ELc97ELc99ELc99ELc101ELc115ELc115ELc52ELc109ELc111ELc100ELc101ELc69ELc49ELc48ELc50ELc54ELc69ELc76ELc78ELc83ELc71ELc95ELc54ELc116ELc97ELc114ELc103ELc101ELc116ELc69ELc50ELc48ELc49ELc52ELc69ELc76ELc78ELc83ELc71ELc95ELc49ELc49ELc112ELc108ELc97ELc99ELc101ELc104ELc111ELc108ELc100ELc101ELc114ELc69ELc49ELc69ELc69ELc69ELc78ELc83ELc70ELc95ELc54ELc98ELc117ELc102ELc102ELc101ELc114ELc73ELc106ELc76ELc105ELc49ELc69ELc78ELc83ELc70ELc95ELc54ELc100ELc101ELc116ELc97ELc105ELc108ELc49ELc55ELc97ELc108ELc105ELc103ELc110ELc101ELc100ELc95ELc97ELc108ELc108ELc111ELc99ELc97ELc116ELc111ELc114ELc73ELc106ELc69ELc69ELc118ELc69ELc69ELc69ELc69ELc69EEEE' as another definition
[2024-09-05T07:35:13.828Z]   208 |             sycl::nd_range<1>(__segments * __wg_size, __wg_size), [=](sycl::nd_item<1> __self_item) {
[2024-09-05T07:35:13.828Z]       |                                                                   ^
[2024-09-05T07:35:13.828Z] /nfs/sc/proj/icl/cmplrarch/comp/onedpl/linux/20240826/include/oneapi/dpl/pstl/hetero/../hetero/dpcpp/parallel_backend_sycl_radix_sort.h:208:67: note: previous definition is here
[2024-09-05T07:35:13.828Z] 1 error generated.

@zhimingwang36 zhimingwang36 merged commit a5a5ae6 into oneapi-src:SYCLomatic Sep 5, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@zhimingwang36 zhimingwang36 zhimingwang36 approved these changes

@intwanghao intwanghao Awaiting requested review from intwanghao intwanghao is a code owner automatically assigned from oneapi-src/syclomatic-reviewers

@wenhuiNi wenhuiNi Awaiting requested review from wenhuiNi wenhuiNi is a code owner automatically assigned from oneapi-src/syclomatic-reviewers

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@the-slow-one @zhimingwang36