azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor, refactor bytecode text tests on when-over-string optimization

Browse Source 
- Merge `duplicatingItemsSameHashCode.kt` and
  `duplicatingItemsSameHashCode2.kt` into one test enabled on both
  backends, and rename it to
  `duplicatingItemsSameHashCodeFewBranches.kt`.
- Rename `duplicatingItemsSameHashCode3.kt` to
  `duplicatingItemsSameHashCodeMoreBranches.kt`, and also enable it for
  both backends.
- Use JVM_TEMPLATES/JVM_IR_TEMPLATES to check backend-specific behavior:
    1) JVM IR does not optimize less than 2 branches by design
    2) JVM IR does not generate duplicate branches, also by design

Related to KT-36846.
This commit is contained in:
Alexander Udalov
2020-08-28 20:22:24 +02:00
parent a639915a34
commit c706673de9
5 changed files with 19 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/bytecodeText/whenStringOptimization/duplicatingItemsSameHashCode.kt
Vendored
-17
View File
@@ -1,17 +0,0 @@
// IGNORE_BACKEND: JVM_IR
// TODO KT-36846 Generate TABLESWITCH/LOOKUPSWITCH in case of matching hashCodes in JVM_IR
fun foo(x : String) : String {
assert("abz]".hashCode() == "aby|".hashCode())
when (x) {
"abz]" -> return "abz"
"ghi" -> return "ghi"
"aby|" -> return "aby"
"abz]" -> return "fail"
}
return "other"
}
// 1 LOOKUPSWITCH
compiler/testData/codegen/bytecodeText/whenStringOptimization/duplicatingItemsSameHashCode2.kt → compiler/testData/codegen/bytecodeText/whenStringOptimization/duplicatingItemsSameHashCodeFewBranches.kt
Vendored
+5 -5
View File
@@ -1,6 +1,3 @@
// IGNORE_BACKEND: JVM
import kotlin.test.assertEquals
fun foo(x : String) : String {
assert("abz]".hashCode() == "aby|".hashCode())
@@ -14,6 +11,9 @@ fun foo(x : String) : String {
return "other"
}
// Expecting 0 LOOKUPSWITCH as there is only 2 different hash codes.
// An IF casecade is more efficient.
// JVM_TEMPLATES:
// 1 LOOKUPSWITCH
// JVM_IR_TEMPLATES:
// Expecting 0 LOOKUPSWITCH as there is only 2 different hash codes. An IF cascade is more efficient.
// 0 LOOKUPSWITCH
compiler/testData/codegen/bytecodeText/whenStringOptimization/duplicatingItemsSameHashCode3.kt → compiler/testData/codegen/bytecodeText/whenStringOptimization/duplicatingItemsSameHashCodeMoreBranches.kt
Vendored
+2 -1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JVM
import kotlin.test.assertEquals
fun foo(x : String) : String {
@@ -16,4 +15,6 @@ fun foo(x : String) : String {
}
// 1 LOOKUPSWITCH
// JVM_IR_TEMPLATES:
// 0 LDC "fail"
compiler/tests/org/jetbrains/kotlin/codegen/BytecodeTextTestGenerated.java
Generated
+6 -11
View File
@@ -4931,19 +4931,14 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest {
runTest("compiler/testData/codegen/bytecodeText/whenStringOptimization/duplicatingItems.kt");
}
@TestMetadata("duplicatingItemsSameHashCode.kt")
public void testDuplicatingItemsSameHashCode() throws Exception {
runTest("compiler/testData/codegen/bytecodeText/whenStringOptimization/duplicatingItemsSameHashCode.kt");
@TestMetadata("duplicatingItemsSameHashCodeFewBranches.kt")
public void testDuplicatingItemsSameHashCodeFewBranches() throws Exception {
runTest("compiler/testData/codegen/bytecodeText/whenStringOptimization/duplicatingItemsSameHashCodeFewBranches.kt");
}
@TestMetadata("duplicatingItemsSameHashCode2.kt")
public void testDuplicatingItemsSameHashCode2() throws Exception {
runTest("compiler/testData/codegen/bytecodeText/whenStringOptimization/duplicatingItemsSameHashCode2.kt");
}
@TestMetadata("duplicatingItemsSameHashCode3.kt")
public void testDuplicatingItemsSameHashCode3() throws Exception {
runTest("compiler/testData/codegen/bytecodeText/whenStringOptimization/duplicatingItemsSameHashCode3.kt");
@TestMetadata("duplicatingItemsSameHashCodeMoreBranches.kt")
public void testDuplicatingItemsSameHashCodeMoreBranches() throws Exception {
runTest("compiler/testData/codegen/bytecodeText/whenStringOptimization/duplicatingItemsSameHashCodeMoreBranches.kt");
}
@TestMetadata("expression.kt")
compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBytecodeTextTestGenerated.java
Generated
+6 -11
View File
@@ -4899,19 +4899,14 @@ public class IrBytecodeTextTestGenerated extends AbstractIrBytecodeTextTest {
runTest("compiler/testData/codegen/bytecodeText/whenStringOptimization/duplicatingItems.kt");
}
@TestMetadata("duplicatingItemsSameHashCode.kt")
public void testDuplicatingItemsSameHashCode() throws Exception {
runTest("compiler/testData/codegen/bytecodeText/whenStringOptimization/duplicatingItemsSameHashCode.kt");
@TestMetadata("duplicatingItemsSameHashCodeFewBranches.kt")
public void testDuplicatingItemsSameHashCodeFewBranches() throws Exception {
runTest("compiler/testData/codegen/bytecodeText/whenStringOptimization/duplicatingItemsSameHashCodeFewBranches.kt");
}
@TestMetadata("duplicatingItemsSameHashCode2.kt")
public void testDuplicatingItemsSameHashCode2() throws Exception {
runTest("compiler/testData/codegen/bytecodeText/whenStringOptimization/duplicatingItemsSameHashCode2.kt");
}
@TestMetadata("duplicatingItemsSameHashCode3.kt")
public void testDuplicatingItemsSameHashCode3() throws Exception {
runTest("compiler/testData/codegen/bytecodeText/whenStringOptimization/duplicatingItemsSameHashCode3.kt");
@TestMetadata("duplicatingItemsSameHashCodeMoreBranches.kt")
public void testDuplicatingItemsSameHashCodeMoreBranches() throws Exception {
runTest("compiler/testData/codegen/bytecodeText/whenStringOptimization/duplicatingItemsSameHashCodeMoreBranches.kt");
}
@TestMetadata("expression.kt")