Do I need AP?

I went to Canada many times before and came back to USA just with my valid I-94. I am not sure that can I come back with my H1 status(I-94) as before during I485 pending? A friend in the internet answered that if I am AOS I have to use AP come back USA doesn't matter from China or Canada. If I have valid H1 I don't need AP. Now I am sure in AOS and according one answer that my H1 is still valid( I didn't applied EAD card and I still work with my H1 status). Do I need AP now? Thanks