Reduce hwloc & cpuid test requirements