that friend (SPR) is the same like you, but he visited macau and only drop by hongkong, no need visa.
not sure yours, but suggest bring along everything to prove that you are a resident of singapore, otherwise, may have troublesome when going back to sgp.