Visiting China with a side trip to Hong Kong in between

I am a Singapore passport holder and plan to visit China for 7 days, then make a day trip to Hong Kong before going back to China again the same day. Does the 15 day without visa rule applies from the date of my first visit, or from the date I re-enter China?