Skip to content
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

[HIP][COMGR] Use COMGR by default for HIP backend #1253

Merged
merged 11 commits into from
Nov 4, 2021
Merged

Conversation

atamazov
Copy link
Contributor

@atamazov atamazov commented Oct 29, 2021

…ages (to smoke test offline builds). Removed W/A for SWDEV-290754 (fixed in 4.3)
@atamazov atamazov added this to the ROCm 5.0 milestone Oct 29, 2021
@atamazov atamazov changed the title [HIP][COMGR] COMGR by default for HIP backend [HIP][COMGR] Use COMGR by default for HIP backend Oct 29, 2021
@codecov

This comment has been minimized.

@atamazov atamazov marked this pull request as ready for review November 3, 2021 20:51
@atamazov
Copy link
Contributor Author

atamazov commented Nov 3, 2021

Passed all CI checks and ready for review.

@junliume
Copy link
Contributor

junliume commented Nov 4, 2021

Gentle ping for @pfultz2 @JehandadKhan and @jerryyin for review.

@junliume junliume merged commit c0636c7 into develop Nov 4, 2021
@atamazov
Copy link
Contributor Author

atamazov commented Nov 4, 2021

⚠️ This PR would lead to gfx90a failures during staging testing

...Because workaround for #1257 is implemented in Jenkinsfile, but CQE use their own. W/A should be re-implemented in CMake. It should use GPU detection + switching off COMGR if it is gfx90a.

@junliume How much time do we have?

@atamazov
Copy link
Contributor Author

atamazov commented Nov 4, 2021

Oh no, the above is not possible because they build dockers somewhere else IIRC...

@atamazov
Copy link
Contributor Author

atamazov commented Nov 4, 2021

It seems like the only option is disable the failing tests for (gfx90a && comgr), dynamically.

@junliume
Copy link
Contributor

junliume commented Nov 5, 2021

It seems like the only option is disable the failing tests for (gfx90a && comgr), dynamically.

@atamazov Staging tests do not include gfx90a unless we ask explicitly. We can explicitly ask them to disable the failing tests for (gfx90a && comgr).
As for the time, I think we still have a few weeks till branching. #1258 definitely have higher priority than this one.

Comment on lines +324 to +325
set_var_to_condition(MIOPEN_USE_COMGR_DEFAULT (NOT DEFINED MIOPEN_BACKEND_OPENCL) AND (NOT DEFINED MIOPEN_MODE_NOGPU))
option(MIOPEN_USE_COMGR "Use comgr to build kernels instead of offline tools" ${MIOPEN_USE_COMGR_DEFAULT})
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

atamazov added a commit that referenced this pull request Nov 9, 2021
atamazov added a commit that referenced this pull request Nov 10, 2021
). Add regression test for issue-internal #4 (#1273)

Resolves (hides symptoms of) https://github.com/ROCmSoftwarePlatform/MIOpen-internal/issues/4 and #1257.

- Reverted #1253 
  - Kept some useful stuff for CMake + tidy fixes for 4.5
- Added regression test for https://github.com/ROCmSoftwarePlatform/MIOpen-internal/issues/4

[Informative] Actual problem is that kernels built via COMGR may have correctness problems (we know some cases for gfx90a).
Comment on lines +84 to +86
// WORKAROUND_SWDEV_290754
// It seems like this W/A is not required since 4.5.
def build_cmd = conf.get("build_cmd", "LLVM_PATH=/opt/rocm/llvm ${build_envs} dumb-init make -j\$(nproc) ${config_targets}")
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

atamazov added a commit that referenced this pull request Nov 13, 2021
… by default for HIP backend (revert #1253).." Keep regression test for issue-internal #4

This reverts commit edd87ed.
@atamazov atamazov deleted the comgr-default branch December 6, 2021 13:31
atamazov added a commit that referenced this pull request Dec 11, 2021
…om COMGR by default for HIP backend (revert #1253).." Keep regression test for issue-internal #4"

This reverts commit 14d6ab0.

# RESOLVED Conflicts:
#	Jenkinsfile
if(${ARGN})
set(${var} TRUE)
else()
set(${name} FALSE)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is wrong, ${var} should be used here. No problem so far because unset var is evaluated to FALSE in conditionals, and we do not use set_var_to_condition to change values of variables. To be fixed soon.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants