Subzero: Fix -timing-focus .

Subzero: Fix -timing-focus .

The problem is that the default timer is renamed to be the current function name, instead of "Total across all functions", but this causes an assertion failure during the final merge of thread-local timers into the global timers, because the names don't match.

The solution is to temporarily rename the timer to be the function name, until the timer is dumped, and then restore it to its original value.

BUG= none
R=jpp@chromium.org

Committed: https://gerrit.chromium.org/gerrit/gitweb?p=native_client/pnacl-subzero.git;a=commit;h=2b000fd83e3d78d0ecd5af1f3a529fb04f3e26ee

[Jim Stichnoth, 2016-04-06 04:13:40]

Description was changed from

==========
Subzero: Fix -timing-focus .

BUG= none
==========

to

==========
Subzero: Fix -timing-focus .

The problem is that the default timer is renamed to be the current function
name, instead of "Total across all functions", but this causes an assertion
failure during the final merge of thread-local timers into the global timers,
because the names don't match.

The solution is to temporarily rename the timer to be the function name, until
the timer is dumped, and then restore it to its original value.

BUG= none
==========

[Jim Stichnoth, 2016-04-06 04:13:40]

stichnot@chromium.org changed reviewers:
+ eholk@chromium.org, jpp@chromium.org, kschimpf@google.com, sehr@chromium.org

[John, 2016-04-06 13:05:32]

lgtm

https://codereview.chromium.org/1867473002/diff/1/src/IceCfg.cpp
File src/IceCfg.cpp (right):

https://codereview.chromium.org/1867473002/diff/1/src/IceCfg.cpp#newcode246
src/IceCfg.cpp:246: std::string OrigName =
Auto, maybe?

https://codereview.chromium.org/1867473002/diff/1/src/IceCfg.cpp#newcode250
src/IceCfg.cpp:250: getContext()->dumpLocalTimers();
Maybe have dumpLocalTimers do the renaming?

https://codereview.chromium.org/1867473002/diff/1/src/IceGlobalContext.cpp
File src/IceGlobalContext.cpp (right):

https://codereview.chromium.org/1867473002/diff/1/src/IceGlobalContext.cpp#ne...
src/IceGlobalContext.cpp:914: auto Timers = &ICE_TLS_GET_FIELD(TLS)->Timers;
Auto *

https://codereview.chromium.org/1867473002/diff/1/src/IceGlobalContext.cpp#ne...
src/IceGlobalContext.cpp:984: auto Timers = &ICE_TLS_GET_FIELD(TLS)->Timers;
Auto *

[Jim Stichnoth, 2016-04-06 13:23:58]

https://codereview.chromium.org/1867473002/diff/1/src/IceCfg.cpp
File src/IceCfg.cpp (right):

https://codereview.chromium.org/1867473002/diff/1/src/IceCfg.cpp#newcode246
src/IceCfg.cpp:246: std::string OrigName =
On 2016/04/06 13:05:32, John wrote:
> Auto, maybe?

Done.

https://codereview.chromium.org/1867473002/diff/1/src/IceCfg.cpp#newcode250
src/IceCfg.cpp:250: getContext()->dumpLocalTimers();
On 2016/04/06 13:05:32, John wrote:
> Maybe have dumpLocalTimers do the renaming?

Very nice!  Done.

https://codereview.chromium.org/1867473002/diff/1/src/IceGlobalContext.cpp
File src/IceGlobalContext.cpp (right):

https://codereview.chromium.org/1867473002/diff/1/src/IceGlobalContext.cpp#ne...
src/IceGlobalContext.cpp:914: auto Timers = &ICE_TLS_GET_FIELD(TLS)->Timers;
On 2016/04/06 13:05:32, John wrote:
> Auto *

Done.

https://codereview.chromium.org/1867473002/diff/1/src/IceGlobalContext.cpp#ne...
src/IceGlobalContext.cpp:984: auto Timers = &ICE_TLS_GET_FIELD(TLS)->Timers;
On 2016/04/06 13:05:32, John wrote:
> Auto *

Done.

[Jim Stichnoth, 2016-04-06 13:37:19]

Description was changed from

==========
Subzero: Fix -timing-focus .

The problem is that the default timer is renamed to be the current function
name, instead of "Total across all functions", but this causes an assertion
failure during the final merge of thread-local timers into the global timers,
because the names don't match.

The solution is to temporarily rename the timer to be the function name, until
the timer is dumped, and then restore it to its original value.

BUG= none
==========

to

==========
Subzero: Fix -timing-focus .

The problem is that the default timer is renamed to be the current function
name, instead of "Total across all functions", but this causes an assertion
failure during the final merge of thread-local timers into the global timers,
because the names don't match.

The solution is to temporarily rename the timer to be the function name, until
the timer is dumped, and then restore it to its original value.

BUG= none
R=jpp@chromium.org

Committed:
https://gerrit.chromium.org/gerrit/gitweb?p=native_client/pnacl-subzero.git;a...
==========

[Jim Stichnoth, 2016-04-06 13:37:20]

Committed patchset #2 (id:20001) manually as
2b000fd83e3d78d0ecd5af1f3a529fb04f3e26ee (presubmit successful).