Strictly Moore's law ended a while back unless you allow fiddling with the factors. It was initially a doubling of transistor count every year, which held until 1975, then it was revised to every 2 years until around 2010 when it again started lagging.