Change cannonicalization rules: add X,X is represented as multiplies, multiplies

of a power of two are represented as a shift.

llvm-svn: 7803