data_address is definitely part of the unique key to trace entries, but instr2 is arbitrary (could be instr1, time1 or time2 as well). Moving data_address up the hierarchy to speed up certain FSP experiments. Change-Id: I37a1f6c1e5b3957ba2f5bf46e0cd1a9c4aa7bfef