PERF: Exploit more distinct AddP operations