JDK-8054376 will make following options 'product':
- UseRTMLocking;
- UseRTMDeopt;
- RTMRetryCount.
Following tests have to be updated to reflect that change:
compiler/rtm/cli/TestRTMRetryCountOption.java
compiler/rtm/cli/TestUseRTMDeoptOnSupportedConfig.java
compiler/rtm/cli/TestUseRTMDeoptOnUnsupportedConfig.java
compiler/rtm/cli/TestUseRTMLockingOptionOnSupportedConfig.java
compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedCPU.java
compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedVM.java
compiler/rtm/cli/TestUseRTMLockingOptionWithBiasedLocking.java
I think it will be enough to copy the same tests from JDK 9 workspace, where corresponding options were 'product' from the beginning.