riscv-perf-model icon indicating copy to clipboard operation
riscv-perf-model copied to clipboard

Resolve conflicts between danbone/issue_143_icache on PR #152 and branch master

Open dragon540 opened this issue 1 year ago • 3 comments

dragon540 avatar Sep 26 '24 17:09 dragon540

:thinking: Shobhit, how did you do the merge? There shouldn't be this many files changed...

klingaard avatar Sep 29 '24 14:09 klingaard

@klingaard, I have mistakenly committed .idea and cmake-build-debug too, removing them should decrease the number of files changed to ~40 files. To do the merge, I copied the branch on PR #152 under my name, and merged master branch into it after resolving conflicts.

dragon540 avatar Sep 29 '24 20:09 dragon540

removed extra files and folders (.idea, cmake-build-debug, etc) from the PR

dragon540 avatar Oct 01 '24 07:10 dragon540

Removed generated log files

dragon540 avatar Oct 21 '24 13:10 dragon540

I was facing some issues with the version of stflib which was there in dan's PR, therefore updated it. However, the version of stflib which is in upstream branch works too. I have updated the stflib submodule to keep it consistent with the present version in olympia.

dragon540 avatar Oct 31 '24 01:10 dragon540