Revert "[AVR] Optimize int8 arithmetic right shift 6 bits"

[akshaykumars614]

Summary

This reverts commit 5723261370b45fa4d0d295845c6ef9e223f2ff4a.

There are failures as reported in

https://lab.llvm.org/buildbot#builders/16/builds/21638
https://lab.llvm.org/buildbot#builders/104/builds/5394

llvm/lib/Target/AVR/AVRExpandPseudoInsts.cpp

private:
   bool expandAtomicBinaryOp(unsigned Opcode, Block &MBB, BlockIt MBBI);
 
   bool expandAtomicArithmeticOp(unsigned MemOpcode, unsigned ArithOpcode,
                                 Block &MBB, BlockIt MBBI);
 
   /// Specific shift implementation.
   bool expandLSLB7Rd(Block &MBB, BlockIt MBBI);
   bool expandLSRB7Rd(Block &MBB, BlockIt MBBI);
-  bool expandASRB6Rd(Block &MBB, BlockIt MBBI);
   bool expandASRB7Rd(Block &MBB, BlockIt MBBI);
   bool expandLSLW4Rd(Block &MBB, BlockIt MBBI);
   bool expandLSRW4Rd(Block &MBB, BlockIt MBBI);
   bool expandLSLW8Rd(Block &MBB, BlockIt MBBI);
   bool expandLSRW8Rd(Block &MBB, BlockIt MBBI);
   bool expandASRW8Rd(Block &MBB, BlockIt MBBI);
   bool expandLSLW12Rd(Block &MBB, BlockIt MBBI);
   bool expandLSRW12Rd(Block &MBB, BlockIt MBBI);
bool AVRExpandPseudo::expand<AVR::LSRBNRd>(Block &MBB, BlockIt MBBI) {
   case 7:
     return expandLSRB7Rd(MBB, MBBI);
   default:
     llvm_unreachable("unimplemented lsrbn");
     return false;
   }
 }
 
-bool AVRExpandPseudo::expandASRB6Rd(Block &MBB, BlockIt MBBI) {
-  MachineInstr &MI = *MBBI;
-  Register DstReg = MI.getOperand(0).getReg();
-  bool DstIsDead = MI.getOperand(0).isDead();
-  bool DstIsKill = MI.getOperand(1).isKill();
-  bool ImpIsDead = MI.getOperand(3).isDead();
-
-  // bst r24, 6
-  // lsl r24
-  // sbc r24, r24
-  // bld r24, 0
-
-  buildMI(MBB, MBBI, AVR::BST)
-      .addReg(DstReg, getKillRegState(DstIsKill))
-      .addImm(6)
-      ->getOperand(2)
-      .setIsUndef(true);
-
-  buildMI(MBB, MBBI, AVR::ADDRdRr) // LSL Rd <==> ADD Rd, Rd
-      .addReg(DstReg, RegState::Define | getDeadRegState(DstIsDead))
-      .addReg(DstReg, getKillRegState(DstIsKill))
-      .addReg(DstReg, getKillRegState(DstIsKill));
-
-  auto MISBC =
-      buildMI(MBB, MBBI, AVR::SBCRdRr)
-          .addReg(DstReg, RegState::Define | getDeadRegState(DstIsDead))
-          .addReg(DstReg, getKillRegState(DstIsKill))
-          .addReg(DstReg, getKillRegState(DstIsKill));
-
-  buildMI(MBB, MBBI, AVR::BLD)
-      .addReg(DstReg, RegState::Define | getDeadRegState(DstIsDead))
-      .addReg(DstReg, getKillRegState(DstIsKill))
-      .addImm(0)
-      ->getOperand(3)
-      .setIsKill();
-
-  if (ImpIsDead)
-    MISBC->getOperand(3).setIsDead();
-
-  MI.eraseFromParent();
-  return true;
-}
-
 bool AVRExpandPseudo::expandASRB7Rd(Block &MBB, BlockIt MBBI) {
   MachineInstr &MI = *MBBI;
   Register DstReg = MI.getOperand(0).getReg();
   bool DstIsDead = MI.getOperand(0).isDead();
   bool DstIsKill = MI.getOperand(1).isKill();
   bool ImpIsDead = MI.getOperand(3).isDead();
 
   // lsl r24
bool AVRExpandPseudo::expandASRB7Rd(Block &MBB, BlockIt MBBI) {
   return true;
 }
 
 template <>
 bool AVRExpandPseudo::expand<AVR::ASRBNRd>(Block &MBB, BlockIt MBBI) {
   MachineInstr &MI = *MBBI;
   unsigned Imm = MI.getOperand(2).getImm();
   switch (Imm) {
-  case 6:
-    return expandASRB6Rd(MBB, MBBI);
   case 7:
     return expandASRB7Rd(MBB, MBBI);
   default:
     llvm_unreachable("unimplemented asrbn");
     return false;
   }
 }
 

llvm/lib/Target/AVR/AVRISelLowering.cpp

if (Op.getOpcode() == ISD::SHL && 4 <= ShiftAmount && ShiftAmount < 7) {
       Victim = DAG.getNode(AVRISD::LSLBN, dl, VT, Victim,
                            DAG.getConstant(7, dl, VT));
       ShiftAmount = 0;
     } else if (Op.getOpcode() == ISD::SRL && ShiftAmount == 7) {
       // Optimize LSR when ShiftAmount == 7.
       Victim = DAG.getNode(AVRISD::LSRBN, dl, VT, Victim,
                            DAG.getConstant(7, dl, VT));
       ShiftAmount = 0;
-    } else if (Op.getOpcode() == ISD::SRA && ShiftAmount == 6) {
-      // Optimize ASR when ShiftAmount == 6.
-      Victim = DAG.getNode(AVRISD::ASRBN, dl, VT, Victim,
-                           DAG.getConstant(6, dl, VT));
-      ShiftAmount = 0;
     } else if (Op.getOpcode() == ISD::SRA && ShiftAmount == 7) {
       // Optimize ASR when ShiftAmount == 7.
       Victim = DAG.getNode(AVRISD::ASRBN, dl, VT, Victim,
                            DAG.getConstant(7, dl, VT));
       ShiftAmount = 0;
     }
   } else if (VT.getSizeInBits() == 16) {
     if (4 <= ShiftAmount && ShiftAmount < 8)

llvm/test/CodeGen/AVR/shift.ll

 ; CHECK-LABEL: lsr_i8_7
 ; CHECK:      rol r24
 ; CHECK-NEXT: clr r24
 ; CHECK-NEXT: rol r24
   %result = lshr i8 %a, 7
   ret i8 %result
 }
 
-define i8 @asr_i8_6(i8 %a) {
-; CHECK-LABEL: asr_i8_6
-; CHECK:      bst r24, 6
-; CHECK-NEXT: lsl r24
-; CHECK-NEXT: sbc r24, r24
-; CHECK-NEXT: bld r24, 0
-  %result = ashr i8 %a, 6
-  ret i8 %result
-}
-
 define i8 @asr_i8_7(i8 %a) {
 ; CHECK-LABEL: asr_i8_7
 ; CHECK:      lsl r24
 ; CHECK-NEXT: sbc r24, r24
   %result = ashr i8 %a, 7
   ret i8 %result
 }