From what I recall looking at lots of the .mil program gunn pics, the C AF forgemark was pretty much the main one up until the mid 00s, after that started seeing Colt "Keyhole", then later down the road the square forgings started showing up. But up through like 2003-2005 you'd see mostly the AF forge marks. Keyhole seems to come in 2005-2008 or so.
My references are mainly digging through Mk12s, M4A1s, Mk18s, etc from those time periods. Most Mk12s were built up through 2004 but some 2005/2006 were done from what I understand, and that SMGLee dude has a photo of a real Mk12 Mod 1 with a Colt Keyhole forgemark upper, so that could have been 2005/2006 production. Also have a photo of the "Mod H" guns that started being slapped together in 2007, one of the prototypes was a Colt Keyhole, and other were on plain keyhole forge uppers. I think Square started showing up after that, like 2010 maybe? I remember seeing a lot of square forge on the market around then when I started building stuff.