Fix perf suite broken by descriptor change
Merge pull request #1452 from chenglou/perf-fix

Fix perf suite broken by descriptor change