-
Notifications
You must be signed in to change notification settings - Fork 787
[SYCL][ESIMD] Add support for addc and subb operations #8758
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
Merged
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
8bebcfc
Initial version
fineg74 c5d83bb
Fix build crash
fineg74 40debc1
Add support for addc and subb
fineg74 0b5a6bd
Remove unnecessary changes
fineg74 59398ea
Address PR comments
fineg74 fe01d7c
Merge remote-tracking branch 'origin/sycl' into addc
fineg74 9051181
Address PR comments
fineg74 89bb384
Merge remote-tracking branch 'origin/sycl' into addc
fineg74 bc9b818
Move e2e tests from test repository
fineg74 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,163 @@ | ||
| //==---------------- addc.cpp - DPC++ ESIMD on-device test ---------==// | ||
| // | ||
| // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. | ||
| // See https://llvm.org/LICENSE.txt for license information. | ||
| // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception | ||
| // | ||
| //===----------------------------------------------------------------------===// | ||
| // REQUIRES: gpu | ||
| // UNSUPPORTED: cuda || hip | ||
| // RUN: %clangxx -fsycl %s -o %t.out | ||
| // RUN: %GPU_RUN_PLACEHOLDER %t.out | ||
|
|
||
| // The test verifies ESIMD API that adds 2 32-bit integer scalars/vectors with | ||
| // carry returning the result as 2 parts: carry flag the input modified operand | ||
| // and addition result as return from function. | ||
|
|
||
| #include "esimd_test_utils.hpp" | ||
|
|
||
| #include <iostream> | ||
| #include <sycl/ext/intel/esimd.hpp> | ||
| #include <sycl/sycl.hpp> | ||
|
|
||
| using namespace sycl; | ||
| using namespace sycl::ext::intel::esimd; | ||
| namespace iesimd = sycl::ext::intel::experimental::esimd; | ||
|
|
||
| template <int N, bool AIsVector, bool BIsVector> bool test(sycl::queue Q) { | ||
| static_assert(AIsVector || BIsVector || N == 1, | ||
| "(Scalar + Scalar) case must have N==1"); | ||
|
|
||
| uint32_t ValuesToTryHost[] = {0, | ||
| 1, | ||
| static_cast<uint32_t>(-1), | ||
| 0x7f, | ||
| static_cast<uint32_t>(-0x7f), | ||
| 0x7fff, | ||
| static_cast<uint32_t>(-0x7fff), | ||
| 0x7ffff, | ||
| static_cast<uint32_t>(-0x7ffff), | ||
| 0x7ffffff, | ||
| 0x80, | ||
| static_cast<uint32_t>(-0x80), | ||
| 0x8000, | ||
| static_cast<uint32_t>(-0x8000), | ||
| 0x800000, | ||
| static_cast<uint32_t>(-0x800000), | ||
| 0x80000000}; | ||
| uint32_t ValuesToTrySize = sizeof(ValuesToTryHost) / sizeof(uint32_t); | ||
|
|
||
| std::cout << "Running case: N=" << N << ", AIsVector=" << AIsVector | ||
| << ", BIsVector=" << BIsVector << std::endl; | ||
|
|
||
| auto ValuesToTryUPtr = | ||
| esimd_test::usm_malloc_shared<uint32_t>(Q, ValuesToTrySize); | ||
| uint32_t *ValuesToTryPtr = ValuesToTryUPtr.get(); | ||
| memcpy(ValuesToTryPtr, ValuesToTryHost, ValuesToTrySize * sizeof(uint32_t)); | ||
|
|
||
| auto ResultsMatrixUPtr = esimd_test::usm_malloc_shared<uint32_t>( | ||
| Q, ValuesToTrySize * ValuesToTrySize * N); | ||
| auto CarryMatrixUPtr = esimd_test::usm_malloc_shared<uint32_t>( | ||
| Q, ValuesToTrySize * ValuesToTrySize * N); | ||
| uint32_t *ResultsMatrixPtr = ResultsMatrixUPtr.get(); | ||
| uint32_t *CarryMatrixPtr = CarryMatrixUPtr.get(); | ||
|
|
||
| try { | ||
| Q.single_task([=]() SYCL_ESIMD_KERNEL { | ||
| simd<uint32_t, N> VecInc(0, 1); | ||
| for (int AI = 0; AI < ValuesToTrySize; AI++) { | ||
| using AType = | ||
| std::conditional_t<AIsVector, simd<uint32_t, N>, uint32_t>; | ||
| uint32_t AScalar = simd<uint32_t, 1>( | ||
| reinterpret_cast<uint32_t *>(ValuesToTryPtr) + AI)[0]; | ||
| AType A = AScalar; | ||
| if constexpr (AIsVector) | ||
| A += VecInc; | ||
|
|
||
| for (int BI = 0; BI < ValuesToTrySize; BI++) { | ||
| using BType = | ||
| std::conditional_t<BIsVector, simd<uint32_t, N>, uint32_t>; | ||
| uint32_t BScalar = simd<uint32_t, 1>( | ||
| reinterpret_cast<uint32_t *>(ValuesToTryPtr) + BI)[0]; | ||
| BType B = BScalar; | ||
| if constexpr (BIsVector) | ||
| B += VecInc; | ||
|
|
||
| using ResType = std::conditional_t<AIsVector || BIsVector, | ||
| simd<uint32_t, N>, uint32_t>; | ||
| ResType Carry = 0; | ||
| ResType Res = iesimd::addc(Carry, A, B); | ||
|
|
||
| if constexpr (AIsVector || BIsVector) { | ||
| Carry.copy_to(CarryMatrixPtr + (ValuesToTrySize * AI + BI) * N); | ||
| Res.copy_to(ResultsMatrixPtr + (ValuesToTrySize * AI + BI) * N); | ||
| } else { | ||
| simd<uint32_t, 1> Carry1 = Carry; | ||
| simd<uint32_t, 1> Res1 = Res; | ||
| Carry1.copy_to(CarryMatrixPtr + (ValuesToTrySize * AI + BI) * N); | ||
| Res1.copy_to(ResultsMatrixPtr + (ValuesToTrySize * AI + BI) * N); | ||
| } | ||
|
|
||
| } // end for BI | ||
| } // end for AI | ||
| }).wait(); | ||
| } catch (sycl::exception const &e) { | ||
| std::cout << "SYCL exception caught: " << e.what() << '\n'; | ||
| return 1; | ||
| } | ||
|
|
||
| using Result64T = uint64_t; | ||
| int NumErrors = 0; | ||
| for (int AI = 0; AI < ValuesToTrySize; AI++) { | ||
| for (int BI = 0; BI < ValuesToTrySize; BI++) { | ||
| for (int I = 0; I < N; I++) { | ||
| uint32_t A = ValuesToTryHost[AI]; | ||
| if constexpr (AIsVector) | ||
| A += I; | ||
| uint32_t B = ValuesToTryHost[BI]; | ||
| if constexpr (BIsVector) | ||
| B += I; | ||
| Result64T R = static_cast<uint32_t>(A); | ||
| R += static_cast<uint32_t>(B); | ||
|
|
||
| uint32_t ExpectedRes = R & 0xffffffff; | ||
| uint32_t ExpectedCarry = (R >> 32) & 0xffffffff; | ||
| uint32_t ComputedRes = | ||
| ResultsMatrixPtr[(AI * ValuesToTrySize + BI) * N + I]; | ||
| uint32_t ComputedCarry = | ||
| CarryMatrixPtr[(AI * ValuesToTrySize + BI) * N + I]; | ||
| if (ComputedRes != ExpectedRes || ComputedCarry != ExpectedCarry) { | ||
| std::cout << "Error for (" << AI << "," << BI << "): " << A << " + " | ||
| << B << " is Computed(" << ComputedCarry << "," | ||
| << ComputedRes << ") != Expected (" << ExpectedCarry << "," | ||
| << ExpectedRes << "), R = " << R << "\n"; | ||
| NumErrors++; | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return NumErrors == 0; | ||
| } | ||
|
|
||
| int main() { | ||
| queue Q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); | ||
| auto D = Q.get_device(); | ||
| std::cout << "Running on " << D.get_info<info::device::name>() << "\n"; | ||
|
|
||
| constexpr bool AIsVector = true; | ||
| constexpr bool BIsVector = true; | ||
| bool Pass = true; | ||
| Pass &= test<16, AIsVector, BIsVector>(Q); | ||
| Pass &= test<8, AIsVector, !BIsVector>(Q); | ||
| Pass &= test<4, !AIsVector, BIsVector>(Q); | ||
|
|
||
| Pass &= test<1, AIsVector, BIsVector>(Q); | ||
| Pass &= test<1, AIsVector, !BIsVector>(Q); | ||
| Pass &= test<1, !AIsVector, BIsVector>(Q); | ||
|
|
||
| Pass &= test<1, !AIsVector, !BIsVector>(Q); | ||
|
|
||
| std::cout << (Pass > 0 ? "Passed\n" : "FAILED\n"); | ||
| return Pass ? 0 : 1; | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.