Instead of relying on runner features, classify based on CPU features. This fixes an annoying issue where if running unit tests locally without it set then you get an unexpected failure. Fixes #1807
