Is this taking efficiency gains into account? I would expect 10X efficiency increase every 3 years given Moore's Law and the hardware appropriate algorithms tendency.

Yes, of course.