Fix bugs: misses several macro calls.
Fix bugs: misses several macro calls.

zcth428/hpctoolkit111,HPCToolkit/hpctoolkit,zcth428/hpctoolkit111,HPCToolkit/hpctoolkit,zcth428/hpctoolkit111,zcth428/hpctoolkit111,zcth428/hpctoolkit,HPCToolkit/hpctoolkit,HPCToolkit/hpctoolkit,zcth428/hpctoolkit111,HPCToolkit/hpctoolkit,zcth428/hpctoolkit,HPCToolkit/hpctoolkit,zcth428/hpctoolkit,zcth428/hpctoolkit,zcth428/hpctoolkit