From 8474803c7c5dd9e974f98838cbdccc48658a3a15 Mon Sep 17 00:00:00 2001 From: Matt Arsenault Date: Thu, 26 Apr 2018 19:21:26 +0000 Subject: [PATCH] AMDGPU: Consolidate SubtargetPredicate definitions llvm-svn: 330979 --- llvm/lib/Target/AMDGPU/AMDGPU.td | 7 +++++++ llvm/lib/Target/AMDGPU/SIInstructions.td | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/llvm/lib/Target/AMDGPU/AMDGPU.td b/llvm/lib/Target/AMDGPU/AMDGPU.td index b419334..37c593d 100644 --- a/llvm/lib/Target/AMDGPU/AMDGPU.td +++ b/llvm/lib/Target/AMDGPU/AMDGPU.td @@ -781,6 +781,13 @@ def HasMadMixInsts : Predicate<"Subtarget->hasMadMixInsts()">, def HasScalarAtomics : Predicate<"Subtarget->hasScalarAtomics()">, AssemblerPredicate<"FeatureScalarAtomics">; +def has16BankLDS : Predicate<"Subtarget->getLDSBankCount() == 16">; +def has32BankLDS : Predicate<"Subtarget->getLDSBankCount() == 32">; +def HasVGPRIndexMode : Predicate<"Subtarget->hasVGPRIndexMode()">, + AssemblerPredicate<"FeatureVGPRIndexMode">; +def HasMovrel : Predicate<"Subtarget->hasMovrel()">, + AssemblerPredicate<"FeatureMovrel">; + def EnableLateCFGStructurize : Predicate< "EnableLateStructurizeCFG">; diff --git a/llvm/lib/Target/AMDGPU/SIInstructions.td b/llvm/lib/Target/AMDGPU/SIInstructions.td index e9b6e78..415806b 100644 --- a/llvm/lib/Target/AMDGPU/SIInstructions.td +++ b/llvm/lib/Target/AMDGPU/SIInstructions.td @@ -11,13 +11,6 @@ // that are not yet supported remain commented out. //===----------------------------------------------------------------------===// -def has16BankLDS : Predicate<"Subtarget->getLDSBankCount() == 16">; -def has32BankLDS : Predicate<"Subtarget->getLDSBankCount() == 32">; -def HasVGPRIndexMode : Predicate<"Subtarget->hasVGPRIndexMode()">, - AssemblerPredicate<"FeatureVGPRIndexMode">; -def HasMovrel : Predicate<"Subtarget->hasMovrel()">, - AssemblerPredicate<"FeatureMovrel">; - class GCNPat : AMDGPUPat { let SubtargetPredicate = isGCN; } -- 2.7.4