From 27712243ab2680fa87b2de52ca4245d7c22f81f8 Mon Sep 17 00:00:00 2001 From: Matt Arsenault Date: Thu, 3 Mar 2022 13:23:41 -0500 Subject: [PATCH] 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. --- llvm/include/llvm/IR/Attributes.td | 3 --- llvm/include/llvm/IR/AttributesAMDGPU.td | 14 -------------- .../Inline/AMDGPU/inline-amdgpu-unsafe-fp-atomics.ll | 4 ++-- 3 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 llvm/include/llvm/IR/AttributesAMDGPU.td diff --git a/llvm/include/llvm/IR/Attributes.td b/llvm/include/llvm/IR/Attributes.td index a0ab913..3065b75 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">; - -// 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 e2a0f04..0000000 --- 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">; 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 46701e7..7de6095 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() -- 2.7.4