Does SIN-HK-PVG-SIN qualify?

Hi,

I (German passport holder) am planning to fly from Singapore to HK on Feb 12 to attend a conference there. I am then planning to leave HK in the evening of Feb 13 to Shanghai (PVG) to visit friends for the weekend, until Feb 15, and then I want to fly back to Singapore in the evening of Feb 15.

Does this itinerary [(SIN-)HK-PVG-SIN] qualify? Or should I better get a flight back to Kuala Lumpur (Malaysia) before I go back to Singapore, meaning I would then fly SIN-HK-PVG-KUL and then KUL-SIN separately.

Looking forward to a reply...thanks!! ;)