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

[AMDGPU] Remove GFX12 encoding hack #78702

Merged
merged 2 commits into from
Jan 19, 2024
Merged

[AMDGPU] Remove GFX12 encoding hack #78702

merged 2 commits into from
Jan 19, 2024

Conversation

jayfoad
Copy link
Contributor

@jayfoad jayfoad commented Jan 19, 2024

This is no longer needed now that we have implemented GFX12 encoding for
all instructions.

This is no longer needed now that we have implemented GFX12 encoding for
all instructions.
@llvmbot
Copy link
Collaborator

llvmbot commented Jan 19, 2024

@llvm/pr-subscribers-backend-amdgpu

Author: Jay Foad (jayfoad)

Changes

This is no longer needed now that we have implemented GFX12 encoding for
all instructions.


Full diff: https://github.com/llvm/llvm-project/pull/78702.diff

1 Files Affected:

  • (modified) llvm/lib/Target/AMDGPU/SIInstrInfo.cpp (-6)
diff --git a/llvm/lib/Target/AMDGPU/SIInstrInfo.cpp b/llvm/lib/Target/AMDGPU/SIInstrInfo.cpp
index 48fdb803e9d7346..5a9401103da8228 100644
--- a/llvm/lib/Target/AMDGPU/SIInstrInfo.cpp
+++ b/llvm/lib/Target/AMDGPU/SIInstrInfo.cpp
@@ -9136,12 +9136,6 @@ int SIInstrInfo::pseudoToMCOpcode(int Opcode) const {
 
   int MCOp = AMDGPU::getMCOpcode(Opcode, Gen);
 
-  // TODO-GFX12: Remove this.
-  // Hack to allow some GFX12 codegen tests to run before all the encodings are
-  // implemented.
-  if (MCOp == (uint16_t)-1 && Gen == SIEncodingFamily::GFX12)
-    MCOp = AMDGPU::getMCOpcode(Opcode, SIEncodingFamily::GFX11);
-
   // -1 means that Opcode is already a native instruction.
   if (MCOp == -1)
     return Opcode;

@jayfoad
Copy link
Contributor Author

jayfoad commented Jan 19, 2024

Depends on #78701 to avoid a spurious encoding problem.

@jayfoad jayfoad merged commit 80ccc72 into llvm:main Jan 19, 2024
3 of 4 checks passed
@jayfoad jayfoad deleted the gfx12-remove-encoding-hack branch January 19, 2024 12:19
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.

None yet

3 participants