Up the phi node folding threshold from a cheap "1" to a meagre "2". Update tests for extra added selects and slight code churn. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@229099 91177308-0d34-0410-b5e6-96231b3b80d8