-
Notifications
You must be signed in to change notification settings - Fork 224
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
[WORKAROUND][OCL][MI100][MI200] Disable MIOpenGEMM convolutions (W/A for #1315). Disable iGemm ASM GTC XDLOPS NCHW convolutions (W/A for #1317) #1321
Merged
Merged
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
85275a8
wa-issue-1315(01) [NFC] Fix comments related to WORKAROUND_MIOPENGEMM…
atamazov 936cba9
wa-issue-1315(02) [NFC] Placeholder for the common part of GEMM solvers
atamazov 3709b50
wa-issue-1315(03) Disable MIOpenGEMM convolutions for xDLOPs GPUs (MI…
atamazov 3429c60
wa-issue-1315(04) Disable iGemm ASM GTC XDLOPS convolutions for OpenC…
atamazov 3363730
wa-issue-1315(05) [tests] Update tests for Opencl BE && MI100/MI200
atamazov 67a2aac
wa-issue-1315(06) [Jenkins] Add Fp32 Full tests stages for Opencl BE …
atamazov 8d94395
wa-issue-1315-1317-312112-313696(01) Disable iGemm ASM GTC XDLOPS con…
atamazov f858673
wa-issue-1315-1317-312112-313696(02) Revert "wa-issue-1315(05) [tests…
atamazov cd0d942
[Batchnorm][ASM] Disabling ASM kernel for unsupported target (gfx940)…
muralinr ed89af5
wa-issue-1315-1317-312112-313696(03) WORKAROUND_ISSUE_1315: Fix typo.…
atamazov 62a3b2d
Merge branch 'develop' into wa-issue-1315-1317-312112-313696
atamazov 81995f4
Revert "[Batchnorm][ASM] Disabling ASM kernel for unsupported target …
atamazov 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 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 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 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 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 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,44 @@ | ||
/******************************************************************************* | ||
* | ||
* MIT License | ||
* | ||
* Copyright (c) 2021 Advanced Micro Devices, Inc. | ||
* | ||
* Permission is hereby granted, free of charge, to any person obtaining a copy | ||
* of this software and associated documentation files (the "Software"), to deal | ||
* in the Software without restriction, including without limitation the rights | ||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
* copies of the Software, and to permit persons to whom the Software is | ||
* furnished to do so, subject to the following conditions: | ||
* | ||
* The above copyright notice and this permission notice shall be included in all | ||
* copies or substantial portions of the Software. | ||
* | ||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
* SOFTWARE. | ||
* | ||
*******************************************************************************/ | ||
|
||
#ifndef GUARD_SOLVER_GEMM_COMMON_HPP_ | ||
#define GUARD_SOLVER_GEMM_COMMON_HPP_ | ||
|
||
#include <miopen/execution_context.hpp> | ||
|
||
namespace miopen { | ||
namespace conv { | ||
namespace solver { | ||
namespace gemm { | ||
|
||
bool IsWorkaroundIssue1315(const miopen::ExecutionContext& ctx); | ||
|
||
} // namespace gemm | ||
} // namespace solver | ||
} // namespace conv | ||
} // namespace miopen | ||
|
||
#endif |
This file contains 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 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 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 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 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 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,59 @@ | ||
/******************************************************************************* | ||
* | ||
* MIT License | ||
* | ||
* Copyright (c) 2021 Advanced Micro Devices, Inc. | ||
* | ||
* Permission is hereby granted, free of charge, to any person obtaining a copy | ||
* of this software and associated documentation files (the "Software"), to deal | ||
* in the Software without restriction, including without limitation the rights | ||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
* copies of the Software, and to permit persons to whom the Software is | ||
* furnished to do so, subject to the following conditions: | ||
* | ||
* The above copyright notice and this permission notice shall be included in all | ||
* copies or substantial portions of the Software. | ||
* | ||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
* SOFTWARE. | ||
* | ||
*******************************************************************************/ | ||
|
||
#include <miopen/config.h> | ||
#include <miopen/solver/gemm_common.hpp> | ||
|
||
#include <tuple> // std::ignore | ||
|
||
/// This W/A disables all GEMM convolution solvers for xDLOPs | ||
/// targets when MIOpenGEMM is used (OCL BE). More info at | ||
/// https://github.com/ROCmSoftwarePlatform/MIOpen/issues/1315. | ||
/// | ||
/// W/A affects ROCm releases starting from 4.5 and also | ||
/// pre-5.0 Mainline HIP builds, e.g. 9148. | ||
#define WORKAROUND_ISSUE_1315 (MIOPEN_USE_MIOPENGEMM && (HIP_PACKAGE_VERSION_FLAT >= 4004000000ULL)) | ||
|
||
namespace miopen { | ||
namespace conv { | ||
namespace solver { | ||
namespace gemm { | ||
|
||
bool IsWorkaroundIssue1315(const miopen::ExecutionContext& ctx) | ||
{ | ||
#if WORKAROUND_ISSUE_1315 | ||
const auto device = ctx.GetStream().GetTargetProperties().Name(); | ||
return (device == "gfx908") || (device == "gfx90a") || (device == "gfx940"); | ||
#else | ||
std::ignore = ctx; | ||
return false; | ||
#endif | ||
} | ||
|
||
} // namespace gemm | ||
} // namespace solver | ||
} // namespace conv | ||
} // namespace miopen |
This file contains 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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
since #1324 resolve this issue, this logic can be removed?sorry I saw #1324 (comment), seems not resolved
cc @shaojiewang
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@atamazov are there other missing cases where we still get the same error? #1324 indeed has fixed the issue raised in the JIRA ticket I think.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK, I'll check.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@junliume @shaojiewang
Please see #1317. I am suspecting this is related to
n_groups > 1
&& OCL BE.