[llvm] [AMDGPU] Eliminate InstCombineTables.td. NFC. (PR #170857)

[Jay Foad via llvm-commits]

https://github.com/jayfoad updated https://github.com/llvm/llvm-project/pull/170857

>From d68bfbfc660748e059534908fe4838a4c2abc1c7 Mon Sep 17 00:00:00 2001
From: Jay Foad <jay.foad at amd.com>
Date: Fri, 5 Dec 2025 13:58:20 +0000
Subject: [PATCH 1/2] [AMDGPU] Eliminate InstCombineTables.td. NFC.

This also eliminates the generated file InstCombineTables.inc which was
99% identical to the existing AMDGPUGenSearchableTables.inc.
---
 llvm/lib/Target/AMDGPU/AMDGPUInstCombineIntrinsic.cpp |  2 +-
 llvm/lib/Target/AMDGPU/AMDGPUSearchableTables.td      |  9 +++++++++
 llvm/lib/Target/AMDGPU/CMakeLists.txt                 |  4 ----
 llvm/lib/Target/AMDGPU/InstCombineTables.td           | 10 ----------
 4 files changed, 10 insertions(+), 15 deletions(-)
 delete mode 100644 llvm/lib/Target/AMDGPU/InstCombineTables.td

diff --git a/llvm/lib/Target/AMDGPU/AMDGPUInstCombineIntrinsic.cpp b/llvm/lib/Target/AMDGPU/AMDGPUInstCombineIntrinsic.cpp
index 4fe5d00679436..47926734d64d4 100644
--- a/llvm/lib/Target/AMDGPU/AMDGPUInstCombineIntrinsic.cpp
+++ b/llvm/lib/Target/AMDGPU/AMDGPUInstCombineIntrinsic.cpp
@@ -35,7 +35,7 @@ struct AMDGPUImageDMaskIntrinsic {
 };
 
 #define GET_AMDGPUImageDMaskIntrinsicTable_IMPL
-#include "InstCombineTables.inc"
+#include "AMDGPUGenSearchableTables.inc"
 
 } // end anonymous namespace
 
diff --git a/llvm/lib/Target/AMDGPU/AMDGPUSearchableTables.td b/llvm/lib/Target/AMDGPU/AMDGPUSearchableTables.td
index 2393346839707..fe452f008c95c 100644
--- a/llvm/lib/Target/AMDGPU/AMDGPUSearchableTables.td
+++ b/llvm/lib/Target/AMDGPU/AMDGPUSearchableTables.td
@@ -413,3 +413,12 @@ def : AlwaysUniform<int_amdgcn_s_getpc>;
 def : AlwaysUniform<int_amdgcn_s_getreg>;
 def : AlwaysUniform<int_amdgcn_s_memrealtime>;
 def : AlwaysUniform<int_amdgcn_s_memtime>;
+
+def AMDGPUImageDMaskIntrinsicTable : GenericTable {
+  let FilterClass = "AMDGPUImageDMaskIntrinsic";
+  let Fields = ["Intr"];
+
+  let PrimaryKey = ["Intr"];
+  let PrimaryKeyName = "getAMDGPUImageDMaskIntrinsic";
+  let PrimaryKeyEarlyOut = 1;
+}
diff --git a/llvm/lib/Target/AMDGPU/CMakeLists.txt b/llvm/lib/Target/AMDGPU/CMakeLists.txt
index 4baae51e021c5..782cbfa76e6e9 100644
--- a/llvm/lib/Target/AMDGPU/CMakeLists.txt
+++ b/llvm/lib/Target/AMDGPU/CMakeLists.txt
@@ -40,10 +40,6 @@ tablegen(LLVM R600GenSubtargetInfo.inc -gen-subtarget)
 
 add_public_tablegen_target(AMDGPUCommonTableGen)
 
-set(LLVM_TARGET_DEFINITIONS InstCombineTables.td)
-tablegen(LLVM InstCombineTables.inc -gen-searchable-tables)
-add_public_tablegen_target(InstCombineTableGen)
-
 add_llvm_target(AMDGPUCodeGen
   AMDGPUAliasAnalysis.cpp
   AMDGPUAlwaysInlinePass.cpp
diff --git a/llvm/lib/Target/AMDGPU/InstCombineTables.td b/llvm/lib/Target/AMDGPU/InstCombineTables.td
deleted file mode 100644
index 3d626414cc5fd..0000000000000
--- a/llvm/lib/Target/AMDGPU/InstCombineTables.td
+++ /dev/null
@@ -1,10 +0,0 @@
-include "AMDGPU.td"
-
-def AMDGPUImageDMaskIntrinsicTable : GenericTable {
-  let FilterClass = "AMDGPUImageDMaskIntrinsic";
-  let Fields = ["Intr"];
-
-  let PrimaryKey = ["Intr"];
-  let PrimaryKeyName = "getAMDGPUImageDMaskIntrinsic";
-  let PrimaryKeyEarlyOut = 1;
-}

>From dcb71499a5c91c1c71fcdb8e3934e265c3ad7942 Mon Sep 17 00:00:00 2001
From: Jay Foad <jay.foad at amd.com>
Date: Fri, 5 Dec 2025 16:25:59 +0000
Subject: [PATCH 2/2] Blind update to BUILD.gn

---
 llvm/utils/gn/secondary/llvm/lib/Target/AMDGPU/BUILD.gn | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/llvm/utils/gn/secondary/llvm/lib/Target/AMDGPU/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/AMDGPU/BUILD.gn
index e5599cb80c0ea..d078403135963 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/AMDGPU/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/AMDGPU/BUILD.gn
@@ -75,11 +75,6 @@ tablegen("AMDGPUGenSDNodeInfo") {
   td_file = "AMDGPU.td"
 }
 
-tablegen("InstCombineTables") {
-  visibility = [ ":LLVMAMDGPUCodeGen" ]
-  args = [ "-gen-searchable-tables" ]
-}
-
 tablegen("R600GenCallingConv") {
   visibility = [ ":LLVMAMDGPUCodeGen" ]
   args = [ "-gen-callingconv" ]
@@ -110,7 +105,6 @@ static_library("LLVMAMDGPUCodeGen") {
     ":AMDGPUGenRegBankGICombiner",
     ":AMDGPUGenRegisterBank",
     ":AMDGPUGenSDNodeInfo",
-    ":InstCombineTables",
     ":R600GenCallingConv",
     ":R600GenDAGISel",
     ":R600GenDFAPacketizer",