kscience/kmath
9
0
Fork 1
Code Issues Pull Requests 6 Packages Projects Releases 16 Wiki Activity

Dev #127

Merged
altavir merged 214 commits from dev into master 2020-08-11 08:33:21 +03:00
Conversation 0 Commits 214 Files Changed 149 +15 -15
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit bf89aa09e5 - Show all commits

26
kmath-ast/src/jvmMain/kotlin/scientifik/kmath/asm/internal/AsmBuilder.kt
View File

@ -1,8 +1,7 @@
package scientifik.kmath.asm.internal package scientifik.kmath.asm.internal
import org.objectweb.asm.* import org.objectweb.asm.*
import org.objectweb.asm.Opcodes.AALOAD import org.objectweb.asm.Opcodes.*
import org.objectweb.asm.Opcodes.RETURN
import org.objectweb.asm.commons.InstructionAdapter import org.objectweb.asm.commons.InstructionAdapter
import scientifik.kmath.asm.internal.AsmBuilder.ClassLoader import scientifik.kmath.asm.internal.AsmBuilder.ClassLoader
import scientifik.kmath.ast.MST import scientifik.kmath.ast.MST
@ -120,8 +119,8 @@ internal class AsmBuilder<T> internal constructor(
val classWriter = ClassWriter(ClassWriter.COMPUTE_FRAMES) { val classWriter = ClassWriter(ClassWriter.COMPUTE_FRAMES) {
visit( visit(
Opcodes.V1_8, V1_8,
Opcodes.ACC_PUBLIC or Opcodes.ACC_FINAL or Opcodes.ACC_SUPER, ACC_PUBLIC or ACC_FINAL or ACC_SUPER,
classType.internalName, classType.internalName,
"${OBJECT_TYPE.descriptor}L${EXPRESSION_TYPE.internalName}<${tType.descriptor}>;", "${OBJECT_TYPE.descriptor}L${EXPRESSION_TYPE.internalName}<${tType.descriptor}>;",
OBJECT_TYPE.internalName, OBJECT_TYPE.internalName,
@ -129,7 +128,7 @@ internal class AsmBuilder<T> internal constructor(
) )
visitField( visitField(
access = Opcodes.ACC_PRIVATE or Opcodes.ACC_FINAL, access = ACC_PRIVATE or ACC_FINAL,
name = "algebra", name = "algebra",
descriptor = tAlgebraType.descriptor, descriptor = tAlgebraType.descriptor,
signature = null, signature = null,
@ -138,7 +137,7 @@ internal class AsmBuilder<T> internal constructor(
) )
visitField( visitField(
access = Opcodes.ACC_PRIVATE or Opcodes.ACC_FINAL, access = ACC_PRIVATE or ACC_FINAL,
name = "constants", name = "constants",
descriptor = OBJECT_ARRAY_TYPE.descriptor, descriptor = OBJECT_ARRAY_TYPE.descriptor,
signature = null, signature = null,
@ -147,7 +146,7 @@ internal class AsmBuilder<T> internal constructor(
) )
visitMethod( visitMethod(
Opcodes.ACC_PUBLIC, ACC_PUBLIC,
"<init>", "<init>",
Type.getMethodDescriptor(Type.VOID_TYPE, tAlgebraType, OBJECT_ARRAY_TYPE), Type.getMethodDescriptor(Type.VOID_TYPE, tAlgebraType, OBJECT_ARRAY_TYPE),
null, null,
@ -187,7 +186,7 @@ internal class AsmBuilder<T> internal constructor(
} }
visitMethod( visitMethod(
Opcodes.ACC_PUBLIC or Opcodes.ACC_FINAL, ACC_PUBLIC or ACC_FINAL,
"invoke", "invoke",
Type.getMethodDescriptor(tType, MAP_TYPE), Type.getMethodDescriptor(tType, MAP_TYPE),
"(L${MAP_TYPE.internalName}<${STRING_TYPE.descriptor}+${tType.descriptor}>;)${tType.descriptor}", "(L${MAP_TYPE.internalName}<${STRING_TYPE.descriptor}+${tType.descriptor}>;)${tType.descriptor}",
@ -223,7 +222,7 @@ internal class AsmBuilder<T> internal constructor(
} }
visitMethod( visitMethod(
Opcodes.ACC_PUBLIC or Opcodes.ACC_FINAL or Opcodes.ACC_BRIDGE or Opcodes.ACC_SYNTHETIC, ACC_PUBLIC or ACC_FINAL or ACC_BRIDGE or ACC_SYNTHETIC,
"invoke", "invoke",
Type.getMethodDescriptor(OBJECT_TYPE, MAP_TYPE), Type.getMethodDescriptor(OBJECT_TYPE, MAP_TYPE),
null, null,
@ -351,7 +350,8 @@ internal class AsmBuilder<T> internal constructor(
} }
/** /**
* Loads a variable [name] arguments [Map] parameter of [Expression.invoke]. The [defaultValue] may be provided. * Loads a variable [name] from arguments [Map] parameter of [Expression.invoke]. The [defaultValue] may be
* provided.
*/ */
internal fun loadVariable(name: String, defaultValue: T? = null): Unit = invokeMethodVisitor.run { internal fun loadVariable(name: String, defaultValue: T? = null): Unit = invokeMethodVisitor.run {
load(invokeArgumentsVar, MAP_TYPE) load(invokeArgumentsVar, MAP_TYPE)
@ -391,7 +391,7 @@ internal class AsmBuilder<T> internal constructor(
/** /**
* Writes a method instruction of opcode with its [owner], [method] and its [descriptor]. The default opcode is * Writes a method instruction of opcode with its [owner], [method] and its [descriptor]. The default opcode is
* [Opcodes.INVOKEINTERFACE], since most Algebra functions are declared in interface. [loadAlgebra] should be * [Opcodes.INVOKEINTERFACE], since most Algebra functions are declared in interfaces. [loadAlgebra] should be
* called before the arguments and this operation. * called before the arguments and this operation.
* *
* The result is casted to [T] automatically. * The result is casted to [T] automatically.
@ -401,7 +401,7 @@ internal class AsmBuilder<T> internal constructor(
method: String, method: String,
descriptor: String, descriptor: String,
expectedArity: Int, expectedArity: Int,
opcode: Int = Opcodes.INVOKEINTERFACE opcode: Int = INVOKEINTERFACE
) { ) {
run loop@{ run loop@{
repeat(expectedArity) { repeat(expectedArity) {
@ -415,7 +415,7 @@ internal class AsmBuilder<T> internal constructor(
owner, owner,
method, method,
descriptor, descriptor,
opcode == Opcodes.INVOKEINTERFACE opcode == INVOKEINTERFACE
) )
invokeMethodVisitor.checkcast(tType) invokeMethodVisitor.checkcast(tType)

4
kmath-ast/src/jvmMain/kotlin/scientifik/kmath/asm/internal/specialization.kt
View File

@ -1,6 +1,6 @@
package scientifik.kmath.asm.internal package scientifik.kmath.asm.internal
import org.objectweb.asm.Opcodes import org.objectweb.asm.Opcodes.INVOKEVIRTUAL
import org.objectweb.asm.Type import org.objectweb.asm.Type
import scientifik.kmath.operations.Algebra import scientifik.kmath.operations.Algebra
@ -54,7 +54,7 @@ internal fun <T> AsmBuilder<T>.tryInvokeSpecific(context: Algebra<T>, name: Stri
method = theName, method = theName,
descriptor = Type.getMethodDescriptor(primitiveMaskBoxed, *Array(arity) { primitiveMask }), descriptor = Type.getMethodDescriptor(primitiveMaskBoxed, *Array(arity) { primitiveMask }),
expectedArity = arity, expectedArity = arity,
opcode = Opcodes.INVOKEVIRTUAL opcode = INVOKEVIRTUAL
) )
return true return true