revise perf
adjust test cases
Merge pull request #927 from bitwangyaoyao:2.4_perf