Reuse l1 cache geometry for scalar l1 and resolve unnecessary differences in comments between upstream