add more archs, support specifying cpu as well