Merged main:5c94dd73b2df1f6b469e858ff29055ac117e8494 into amd-gfx:ae15f5c22c46

SC llvm team · SC llvm team · commit 8ffbe2f0eec3 · 2024-08-25T02:45:54.000-04:00
Local branch amd-gfx ae15f5c Merged main:0916ae49b89db6eb9eee9f6fee4f1a65fd9cdb74 into amd-gfx:b0eb828c0946 Remote branch main 5c94dd7 [X86][AMX] Avoid to construct invalid shape for checking, NFCI (llvm#105973)
diff --git a/llvm/include/llvm/CodeGen/VirtRegMap.h b/llvm/include/llvm/CodeGen/VirtRegMap.h
@@ -114,7 +114,7 @@ class TargetInstrInfo;
     bool isShapeMapEmpty() const { return Virt2ShapeMap.empty(); }
 
     bool hasShape(Register virtReg) const {
-      return getShape(virtReg).isValid();
+      return Virt2ShapeMap.contains(virtReg);
     }
 
     ShapeT getShape(Register virtReg) const {
diff --git a/llvm/include/llvm/Config/llvm-config.h.cmake b/llvm/include/llvm/Config/llvm-config.h.cmake
@@ -16,7 +16,7 @@
 
 /* Indicate that this is LLVM compiled from the amd-gfx branch. */
 #define LLVM_HAVE_BRANCH_AMD_GFX
-#define LLVM_MAIN_REVISION 509551
+#define LLVM_MAIN_REVISION 509552
 
 /* Define if LLVM_ENABLE_DUMP is enabled */
 #cmakedefine LLVM_ENABLE_DUMP

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ class TargetInstrInfo;`
`114`	`114`	`bool isShapeMapEmpty() const { return Virt2ShapeMap.empty(); }`
`115`	`115`
`116`	`116`	`bool hasShape(Register virtReg) const {`
`117`		`- return getShape(virtReg).isValid();`
	`117`	`+ return Virt2ShapeMap.contains(virtReg);`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`ShapeT getShape(Register virtReg) const {`