[VE] Clean existing code in develop branch

Change the order of functions and statements to reduce the number of
conflicts between upstream and develop branch.

Author: kaz7

llvm/lib/Target/VE/VECustomDAG.h

@@ -43,12 +43,6 @@ template <typename ElemT> ElemT &ref_to(std::unique_ptr<ElemT> &UP) {
 }
 /// } Helpers
 
-class VESubtarget;
-
-using PosOpt = Optional<unsigned>;
-
-/// } Broadcast, Shuffle, Mask Analysis
-
 /// Packing {
 using LaneBits = std::bitset<256>;
 
@@ -125,6 +119,8 @@ SDValue getUnpackAVL(SDValue N);
 
 /// } Packing
 
+using PosOpt = Optional<unsigned>;
+
 //// VVP Machinery {
 // VVP property queries
 PosOpt getVVPOpcode(unsigned OpCode);
@@ -142,8 +138,8 @@ bool isVVP(unsigned Opcode);
 bool isVVPTernaryOp(unsigned Opcode);
 bool isVVPBinaryOp(unsigned Opcode);
 bool isVVPUnaryOp(unsigned Opcode);
-bool isVVPConversionOp(unsigned VVPOC);
-bool isVVPReductionOp(unsigned VVPOC);
+bool isVVPConversionOp(unsigned Opcode);
+bool isVVPReductionOp(unsigned Opcode);
 
 MVT splitVectorType(MVT VT);
 EVT splitType(LLVMContext &Ctx, EVT PackedVT, PackElem P);