Resolve conflicts between PR #152 and branch master #211
Conversation
Signed-off-by: danbone <[email protected]>
…/riscv-perf-model into danbone/issue_143_icache
…-perf-model into shobhit/issue_143_icache
|
🤔 Shobhit, how did you do the merge? There shouldn't be this many files changed... |
|
@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. |
There was a problem hiding this comment.
please remove the clion (.idea etc) and .cmake files from this PR and push again
also the cmake-build-debug/CMakeCache.txt cache files should not be part of the PR. I assume these are also part of clion.
you should consider adding these files to the toplevel .gitignore for future
|
removed extra files and folders (.idea, cmake-build-debug, etc) from the PR |
…tes for filtering instructions for fusion
| @@ -0,0 +1,3 @@ | |||
| Start testing: Sep 23 23:54 IST | |||
| ---------------------------------------------------------- | |||
There was a problem hiding this comment.
This file is generated collateral, i dont think it should be in the commit list.
| @@ -0,0 +1,3 @@ | |||
| Start testing: Sep 23 23:54 IST | |||
| ---------------------------------------------------------- | |||
There was a problem hiding this comment.
This is also generated, I don't see a reason to commit it.
|
Removed generated log files |
dragon540
changed the title
stf_lib
Outdated
There was a problem hiding this comment.
Did you intend to update stflib?
|
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. |
No description provided.