Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Track merges from master -> openj9 branch #5

Closed
DanHeidinga opened this issue Sep 21, 2017 · 7 comments
Closed

Track merges from master -> openj9 branch #5

DanHeidinga opened this issue Sep 21, 2017 · 7 comments

Comments

@DanHeidinga
Copy link
Member

DanHeidinga commented Sep 21, 2017

While we have an automated build to sync from Eclipse OMR to the openj9-omr repo's master branch, there isn't yet automation to test and promote to the openj9 branch.

A verbose and overly careful process for doing this:

$ git fetch openj9-omr // fetch from the remote
$ git checkout master
$ git rebase openj9-omr/master // ensure local master is up to date
$ git log --oneline // get listing of commits to determine which to promote to the openj9 branch
$ git checkout openj9
$ git rebase master // This MUST be a fast forward merge. If it's not, there's a problem
$ git log --oneline // ensure history is the same as above
$ git reset --hard sha_of_chosen_commit
$ git push openj9-omr openj9 // format is and branch must be openj9

Use this item to track when the openj9 branch is updated.

@DanHeidinga
Copy link
Member Author

heidingas-mbp:omr heidinga$ git push openj9-omr openj9
Total 0 (delta 0), reused 0 (delta 0)
To https://github.com/eclipse/openj9-omr.git
617de12..0366145 openj9 -> openj9

@DanHeidinga
Copy link
Member Author

heidingas-mbp:omr heidinga$ git push openj9-omr openj9
Total 0 (delta 0), reused 0 (delta 0)
To https://github.com/eclipse/openj9-omr.git
0366145..c10a67a openj9 -> openj9

@0xdaryl
Copy link
Contributor

0xdaryl commented Sep 22, 2017

Total 0 (delta 0), reused 0 (delta 0)
To https://github.com/eclipse/openj9-omr.git
c10a67a..3271be8 openj9 -> openj9

@DanHeidinga
Copy link
Member Author

heidingas-mbp:omr heidinga$ git push openj9-omr openj9
Total 0 (delta 0), reused 0 (delta 0)
To https://github.com/eclipse/openj9-omr.git
3271be8..b746dab openj9 -> openj9

@DanHeidinga
Copy link
Member Author

heidingas-mbp:omr heidinga$ git push openj9-omr openj9
Total 0 (delta 0), reused 0 (delta 0)
To https://github.com/eclipse/openj9-omr.git
b746dab..2d351f7 openj9 -> openj9

@DanHeidinga
Copy link
Member Author

Closing this as the automated build is now in place.

When code is promoted from master -> openj9 branch, the automated build adds a tag. See #4 (comment) for details.

@DanHeidinga
Copy link
Member Author

Closing this as well.

genie-openj9 pushed a commit that referenced this issue Feb 2, 2021
Tests fail in the following way:

```
18:26:45  [----------] 450 tests from SelectCompareTest/Int32SelectInt8CompareTest
18:26:45  Assertion failed at /home/jenkins/workspace/Build/compiler/riscv/codegen/OMRTreeEvaluator.cpp:114: false
18:26:45  	Opcode bcmpeq is not implemented
18:26:45
18:26:45  compiling file:line:name at level: warm
18:26:45  #0: function TR_LinuxCallStackIterator::printStackBacktrace(TR::Compilation*)+0x2a [0x40017112f4]
18:26:45  #1: function TR_Debug::printStackBacktrace()+0x28 [0x40014f2f42]
18:26:45  #2: ./fvtest/compilertriltest/comptest(+0x133a28e) [0x400133a28e]
18:26:45  #3: ./fvtest/compilertriltest/comptest(+0x133a366) [0x400133a366]
18:26:45  #4: function TR::assertion(char const*, int, char const*, char const*, ...)+0xac [0x400133a416]
18:26:45  #5: function OMR::RV::TreeEvaluator::unImpOpEvaluator(TR::Node*, TR::CodeGenerator*)+0x56 [0x4001523796]
18:26:45  #6: function OMR::CodeGenerator::evaluate(TR::Node*)+0x1a2 [0x4001540254]
18:26:45  #7: function OMR::RV::TreeEvaluator::iselectEvaluator(TR::Node*, TR::CodeGenerator*)+0x6e [0x4001723a96]
18:26:45  #8: function OMR::CodeGenerator::evaluate(TR::Node*)+0x1a2 [0x4001540254]
18:26:45  #9: function genericReturnEvaluator(TR::Node*, OMR::RealRegister::RegNum, TR_RegisterKinds, TR_ReturnInfo, TR::CodeGenerator*)+0x4e [0x4001722790]
18:26:45  #10: function OMR::RV::TreeEvaluator::ireturnEvaluator(TR::Node*, TR::CodeGenerator*)+0x42 [0x40017228c6]
18:26:45  #11: function OMR::CodeGenerator::evaluate(TR::Node*)+0x1a2 [0x4001540254]
```

Signed-off-by: Filip Jeremic <fjeremic@ca.ibm.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants