From 667563e84d6ebe805f2349108ff7ef4827b080a6 Mon Sep 17 00:00:00 2001 From: Matt Arsenault Date: Mon, 9 Sep 2019 15:20:44 +0000 Subject: [PATCH] AMDGPU/GlobalISel: Try generated matcher before add/sub code This will allow optimization patterns which fold adds away to work. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@371406 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/AMDGPU/AMDGPUInstructionSelector.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/Target/AMDGPU/AMDGPUInstructionSelector.cpp b/lib/Target/AMDGPU/AMDGPUInstructionSelector.cpp index b0f4c2f36c3..99fa46eb665 100644 --- a/lib/Target/AMDGPU/AMDGPUInstructionSelector.cpp +++ b/lib/Target/AMDGPU/AMDGPUInstructionSelector.cpp @@ -1289,11 +1289,9 @@ bool AMDGPUInstructionSelector::select(MachineInstr &I) { return selectImpl(I, *CoverageInfo); case TargetOpcode::G_ADD: case TargetOpcode::G_SUB: - if (selectG_ADD_SUB(I)) + if (selectImpl(I, *CoverageInfo)) return true; - LLVM_FALLTHROUGH; - default: - return selectImpl(I, *CoverageInfo); + return selectG_ADD_SUB(I); case TargetOpcode::G_INTTOPTR: case TargetOpcode::G_BITCAST: return selectCOPY(I); @@ -1355,6 +1353,8 @@ bool AMDGPUInstructionSelector::select(MachineInstr &I) { // is checking for G_CONSTANT I.setDesc(TII.get(AMDGPU::ATOMIC_FENCE)); return true; + default: + return selectImpl(I, *CoverageInfo); } return false; } -- 2.50.1