You could *temporarily* turn the changes from 8592 to 8737 into patches with qimport, qpop them, use hg update to move somewhere else, and then qpush them. Be VERY CAREFUL while doing this. Don't commit anything in that tree you intend to use anywhere else. Move work from there to a unadulterated tree with patch files. The problem is that once you turn a real change into a patch, I'm pretty sure it will never be the same change again in mercurial's eyes. If that made it into the main repository somehow, I'm sure lots of bad and confusing things would happen.

Generally speaking, my SE/FS changes *shouldn't* have changed any simulation behavior except maybe some stats about miscregs being accessed more or less often in some cases since the code is always there now. If you find that it does, that would be a great place to look for your bug. There's been only one real live bug that came out of the SE/FS merge so far as far as I know, but be careful you're not hitting that if you're immediately after the merge. I vaguely remember that being a failing assert so you're probably not.

Gabe

Quoting Nilay Vaish <[email protected]>:

I am facing a peculiar problem in bisecting the repo for a particular problem. In January, I committed a few patches to the o3 cpu, just after Gabe's commits for SE/FS merger. When I committed those patches, I was able to boot a 4 core, x86, o3 cpu, ruby system. But it seems I was working with a repo that did not had Gabe's patches.

A couple of days back I tried booting the same system again (with the latest repo and with the repo when I had just committed those patches), and it does not work. I get some error about "bad page state in process swapper". I back ported the o3 cpu patches to the version just before Gabe's commits i.e. 8737:770ccf3af571, this allowed me to boot the system.

I need to figure out what is going on wrong when I try to work with 8824:a42647b4a6b6. Since Gabe committed most of his patches over the version 8592:30a97c4198df, I am not able to bisect the repo, as the patches between 8592 and 8737 are removed when I update to any version greater than 8737. I not sure how to bisect the repo so that I can figure out which patch is causing the problem.

Does any one has some suggestion on how to do this?

Thanks
Nilay
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev



_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev

Reply via email to