[llvm] 2771224 - Revert "Inliner: Correctly merge amdgpu-unsafe-fp-atomics attribute"

[Matt Arsenault via llvm-commits]

Author: Matt Arsenault
Date: 2022-03-03T15:25:32-05:00
New Revision: 27712243ab2680fa87b2de52ca4245d7c22f81f8

URL: https://github.com/llvm/llvm-project/commit/27712243ab2680fa87b2de52ca4245d7c22f81f8
DIFF: https://github.com/llvm/llvm-project/commit/27712243ab2680fa87b2de52ca4245d7c22f81f8.diff

LOG: Revert "Inliner: Correctly merge amdgpu-unsafe-fp-atomics attribute"

This reverts commit 169ebf03ab2a6f16bfa32a36305929c7bc8e4784.

This was effectively rendering the attribute useless in the real
world, although this is still broken.

Added: 
    

Modified: 
    llvm/include/llvm/IR/Attributes.td
    llvm/test/Transforms/Inline/AMDGPU/inline-amdgpu-unsafe-fp-atomics.ll

Removed: 
    llvm/include/llvm/IR/AttributesAMDGPU.td


################################################################################
diff  --git a/llvm/include/llvm/IR/Attributes.td b/llvm/include/llvm/IR/Attributes.td
index a0ab91382691e..3065b75deb17c 100644
--- a/llvm/include/llvm/IR/Attributes.td
+++ b/llvm/include/llvm/IR/Attributes.td
@@ -350,6 +350,3 @@ def : MergeRule<"adjustCallerStackProbeSize">;
 def : MergeRule<"adjustMinLegalVectorWidth">;
 def : MergeRule<"adjustNullPointerValidAttr">;
 def : MergeRule<"setAND<MustProgressAttr>">;
-
-// Target dependent attributes
-include "llvm/IR/AttributesAMDGPU.td"

diff  --git a/llvm/include/llvm/IR/AttributesAMDGPU.td b/llvm/include/llvm/IR/AttributesAMDGPU.td
deleted file mode 100644
index e2a0f045b6569..0000000000000
--- a/llvm/include/llvm/IR/AttributesAMDGPU.td
+++ /dev/null
@@ -1,14 +0,0 @@
-//===- AttributesAMDGPU.td - Defines AMDGPU attributes -----*- tablegen -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file defines AMDGPU specific attributes.
-//
-//===----------------------------------------------------------------------===//
-
-def AMDGPUUnsafeFPAtomics : StrBoolAttr<"amdgpu-unsafe-fp-atomics">;
-def : MergeRule<"setAND<AMDGPUUnsafeFPAtomicsAttr>">;

diff  --git a/llvm/test/Transforms/Inline/AMDGPU/inline-amdgpu-unsafe-fp-atomics.ll b/llvm/test/Transforms/Inline/AMDGPU/inline-amdgpu-unsafe-fp-atomics.ll
index 46701e7ca52dd..7de6095294fe3 100644
--- a/llvm/test/Transforms/Inline/AMDGPU/inline-amdgpu-unsafe-fp-atomics.ll
+++ b/llvm/test/Transforms/Inline/AMDGPU/inline-amdgpu-unsafe-fp-atomics.ll
@@ -37,7 +37,7 @@ define i32 @default_call_default() #0 {
 
 define i32 @unsafe_fp_atomic_enabled_call_default() #1 {
 ; CHECK-LABEL: define {{[^@]+}}@unsafe_fp_atomic_enabled_call_default
-; CHECK-SAME: () #[[ATTR2]] {
+; CHECK-SAME: () #[[ATTR1]] {
 ; CHECK-NEXT:    ret i32 0
 ;
   %call = call i32 @func_default()
@@ -55,7 +55,7 @@ define i32 @unsafe_fp_atomic_enabled_call_unsafe_fp_atomic_enabled() #1 {
 
 define i32 @unsafe_fp_atomic_enabled_call_unsafe_fp_atomic_disabled() #1 {
 ; CHECK-LABEL: define {{[^@]+}}@unsafe_fp_atomic_enabled_call_unsafe_fp_atomic_disabled
-; CHECK-SAME: () #[[ATTR2]] {
+; CHECK-SAME: () #[[ATTR1]] {
 ; CHECK-NEXT:    ret i32 0
 ;
   %call = call i32 @func_unsafe_fp_atomic_disabled()