Vm-dev September 2019

vm-dev@lists.squeakfoundation.org

21 participants
118 discussions

VM Maker: VMMaker.oscog-cb.2564.mcz
by commits＠source.squeak.org 13 Sep '19

13 Sep '19

ClementBera uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-cb.2564.mcz ==================== Summary ==================== Name: VMMaker.oscog-cb.2564 Author: cb Time: 13 September 2019, 12:33:19.828433 pm UUID: c39706ec-0a00-4bdf-b4db-8d2e906e173e Ancestors: VMMaker.oscog-nice.2563 Stop generating forwarder following code for constants and self in methods in #class and for self in methods in #== / #~~. Self in block has still to be followed because self can be a forwarder in blocks without inst var accesses (anyway self == something in block is not super common). This SimStackEntry>>mayBeAForwarder was tricky to make work, maybe there's a better solution (cmacro for inBlock, force inlining, etc.). =============== Diff against VMMaker.oscog-nice.2563 =============== Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveClass (in category 'primitive generators') ----- genPrimitiveClass | reg | reg := ReceiverResultReg. cogit methodNumArgs > 0 ifTrue: [cogit methodNumArgs > 1 ifTrue: [^UnimplementedPrimitive]. cogit genLoadArgAtDepth: 0 into: (reg := Arg0Reg)]. (self genGetClassObjectOf: reg into: ReceiverResultReg scratchReg: TempReg + mayBeAForwarder: reg ~= ReceiverResultReg) = BadRegisterSet ifTrue: - instRegIsReceiver: reg = ReceiverResultReg) = BadRegisterSet ifTrue: [self genGetClassObjectOf: reg into: ClassReg scratchReg: TempReg + mayBeAForwarder: reg ~= ReceiverResultReg. - instRegIsReceiver: reg = ReceiverResultReg. cogit MoveR: ClassReg R: ReceiverResultReg]. cogit genPrimReturn. ^UnfailingPrimitive! Item was added: + ----- Method: CogObjectRepresentation>>isUnannotatableConstant: (in category 'testing') ----- + isUnannotatableConstant: simStackEntry + <inline: true> + <var: 'simStackEntry' type: #'CogSimStackEntry *'> + ^simStackEntry type = SSConstant + and: [(objectMemory isImmediate: simStackEntry constant) + or: [(self shouldAnnotateObjectReference: simStackEntry constant) not]]! Item was removed: - ----- Method: CogObjectRepresentationForSpur>>genGetClassObjectOf:into:scratchReg:instRegIsReceiver: (in category 'compile abstract instructions') ----- - genGetClassObjectOf: instReg into: destReg scratchReg: scratchReg instRegIsReceiver: instRegIsReceiver - "Fetch the instance's class into destReg. If the instance is not the receiver and is forwarded, follow forwarding." - | jumpIsImm jumpNotForwarded loop | - <var: #jumpIsImm type: #'AbstractInstruction *'> - <var: #jumpNotForwarded type: #'AbstractInstruction *'> - <var: #loop type: #'AbstractInstruction *'> - (instReg = destReg or: [instReg = scratchReg or: [destReg = scratchReg]]) ifTrue: - [^BadRegisterSet]. - loop := cogit MoveR: instReg R: scratchReg. - cogit AndCq: objectMemory tagMask R: scratchReg. - jumpIsImm := cogit JumpNonZero: 0. - self flag: #endianness. - "Get least significant half of header word in destReg" - cogit MoveMw: 0 r: instReg R: scratchReg. - "mask off class index" - cogit AndCq: objectMemory classIndexMask R: scratchReg. - instRegIsReceiver ifFalse: - ["if it is forwarded..." - cogit CmpCq: objectMemory isForwardedObjectClassIndexPun R: scratchReg. - jumpNotForwarded := cogit JumpNonZero: 0. - "...follow the forwarding pointer and loop to fetch its classIndex" - cogit MoveMw: objectMemory baseHeaderSize r: instReg R: instReg. - cogit Jump: loop. - jumpNotForwarded jmpTarget: cogit Label]. - jumpIsImm jmpTarget: - (cogit MoveR: scratchReg R: destReg). - scratchReg = TempReg - ifTrue: - [cogit PushR: instReg. - self genGetClassObjectOfClassIndex: destReg into: instReg scratchReg: TempReg. - cogit MoveR: instReg R: destReg. - cogit PopR: instReg] - ifFalse: - [self genGetClassObjectOfClassIndex: destReg into: scratchReg scratchReg: TempReg. - cogit MoveR: scratchReg R: destReg]. - ^0! Item was added: + ----- Method: CogObjectRepresentationForSpur>>genGetClassObjectOf:into:scratchReg:mayBeAForwarder: (in category 'compile abstract instructions') ----- + genGetClassObjectOf: instReg into: destReg scratchReg: scratchReg mayBeAForwarder: mayBeAForwarder + "Fetch the instance's class into destReg. If the instance is not the receiver and is forwarded, follow forwarding." + | jumpIsImm jumpNotForwarded loop | + <var: #jumpIsImm type: #'AbstractInstruction *'> + <var: #jumpNotForwarded type: #'AbstractInstruction *'> + <var: #loop type: #'AbstractInstruction *'> + (instReg = destReg or: [instReg = scratchReg or: [destReg = scratchReg]]) ifTrue: + [^BadRegisterSet]. + loop := cogit MoveR: instReg R: scratchReg. + cogit AndCq: objectMemory tagMask R: scratchReg. + jumpIsImm := cogit JumpNonZero: 0. + self flag: #endianness. + "Get least significant half of header word in destReg" + cogit MoveMw: 0 r: instReg R: scratchReg. + "mask off class index" + cogit AndCq: objectMemory classIndexMask R: scratchReg. + mayBeAForwarder ifTrue: + ["if it is forwarded..." + cogit CmpCq: objectMemory isForwardedObjectClassIndexPun R: scratchReg. + jumpNotForwarded := cogit JumpNonZero: 0. + "...follow the forwarding pointer and loop to fetch its classIndex" + cogit MoveMw: objectMemory baseHeaderSize r: instReg R: instReg. + cogit Jump: loop. + jumpNotForwarded jmpTarget: cogit Label]. + jumpIsImm jmpTarget: + (cogit MoveR: scratchReg R: destReg). + scratchReg = TempReg + ifTrue: + [cogit PushR: instReg. + self genGetClassObjectOfClassIndex: destReg into: instReg scratchReg: TempReg. + cogit MoveR: instReg R: destReg. + cogit PopR: instReg] + ifFalse: + [self genGetClassObjectOfClassIndex: destReg into: scratchReg scratchReg: TempReg. + cogit MoveR: scratchReg R: destReg]. + ^0! Item was removed: - ----- Method: CogObjectRepresentationForSqueakV3>>genGetClassObjectOf:into:scratchReg:instRegIsReceiver: (in category 'compile abstract instructions') ----- - genGetClassObjectOf: instReg into: destReg scratchReg: scratchReg instRegIsReceiver: instRegIsReceiver - "Fetch the instance's class into destReg. This is almost identical - to genGetClassFormatOfNonInt:into:scratchReg: but because we - put the fetch of SmallInteger between the then and the else for - compact class/non-compact class we cannot easily share code. - instRegIsReceiver is ignored. It is for Spur compatibility where - objects may be forwarded." - | jumpIsInt jumpCompact jumpGotClass jumpGotClass2 | - <var: #jumpIsInt type: #'AbstractInstruction *'> - <var: #jumpCompact type: #'AbstractInstruction *'> - <var: #jumpGotClass type: #'AbstractInstruction *'> - <var: #jumpGotClass2 type: #'AbstractInstruction *'> - cogit MoveR: instReg R: scratchReg. - cogit AndCq: 1 R: scratchReg. - jumpIsInt := cogit JumpNonZero: 0. - "Get header word in scratchReg" - cogit MoveMw: 0 r: instReg R: scratchReg. - "Form the byte index of the compact class field" - cogit LogicalShiftRightCq: (objectMemory compactClassFieldLSB - objectMemory shiftForWord) R: scratchReg. - cogit AndCq: self compactClassFieldMask << objectMemory shiftForWord R: scratchReg. - jumpCompact := cogit JumpNonZero: 0. - cogit MoveMw: objectMemory classFieldOffset r: instReg R: destReg. - cogit AndCq: AllButTypeMask signedIntFromLong R: destReg. - jumpGotClass := cogit Jump: 0. - jumpIsInt jmpTarget: (cogit genMoveConstant: objectMemory classSmallInteger R: destReg). - jumpGotClass2 := cogit Jump: 0. - "Don't have to subtract one from the destReg compactClassArray index because of the header word." - self assert: objectMemory baseHeaderSize = objectMemory wordSize. - jumpCompact jmpTarget: - (cogit annotate: (cogit MoveMw: (objectMemory splObj: CompactClasses) r: scratchReg R: destReg) - objRef: (objectMemory splObj: CompactClasses)). - jumpGotClass jmpTarget: - (jumpGotClass2 jmpTarget: cogit Label). - ^0! Item was added: + ----- Method: CogObjectRepresentationForSqueakV3>>genGetClassObjectOf:into:scratchReg:mayBeAForwarder: (in category 'compile abstract instructions') ----- + genGetClassObjectOf: instReg into: destReg scratchReg: scratchReg mayBeAForwarder: mayBeAForwarder + "Fetch the instance's class into destReg. This is almost identical + to genGetClassFormatOfNonInt:into:scratchReg: but because we + put the fetch of SmallInteger between the then and the else for + compact class/non-compact class we cannot easily share code. + instRegIsReceiver is ignored. It is for Spur compatibility where + objects may be forwarded." + | jumpIsInt jumpCompact jumpGotClass jumpGotClass2 | + <var: #jumpIsInt type: #'AbstractInstruction *'> + <var: #jumpCompact type: #'AbstractInstruction *'> + <var: #jumpGotClass type: #'AbstractInstruction *'> + <var: #jumpGotClass2 type: #'AbstractInstruction *'> + cogit MoveR: instReg R: scratchReg. + cogit AndCq: 1 R: scratchReg. + jumpIsInt := cogit JumpNonZero: 0. + "Get header word in scratchReg" + cogit MoveMw: 0 r: instReg R: scratchReg. + "Form the byte index of the compact class field" + cogit LogicalShiftRightCq: (objectMemory compactClassFieldLSB - objectMemory shiftForWord) R: scratchReg. + cogit AndCq: self compactClassFieldMask << objectMemory shiftForWord R: scratchReg. + jumpCompact := cogit JumpNonZero: 0. + cogit MoveMw: objectMemory classFieldOffset r: instReg R: destReg. + cogit AndCq: AllButTypeMask signedIntFromLong R: destReg. + jumpGotClass := cogit Jump: 0. + jumpIsInt jmpTarget: (cogit genMoveConstant: objectMemory classSmallInteger R: destReg). + jumpGotClass2 := cogit Jump: 0. + "Don't have to subtract one from the destReg compactClassArray index because of the header word." + self assert: objectMemory baseHeaderSize = objectMemory wordSize. + jumpCompact jmpTarget: + (cogit annotate: (cogit MoveMw: (objectMemory splObj: CompactClasses) r: scratchReg R: destReg) + objRef: (objectMemory splObj: CompactClasses)). + jumpGotClass jmpTarget: + (jumpGotClass2 jmpTarget: cogit Label). + ^0! Item was changed: ----- Method: CogObjectRepresentationForSqueakV3>>genGetClassTagOf:into:scratchReg: (in category 'compile abstract instructions') ----- genGetClassTagOf: instReg into: destReg scratchReg: scratchReg "Compatibility with SpurObjectRepresentation/SpurMemoryManager." | entryLabel | <var: #entryLabel type: #'AbstractInstruction *'> cogit AlignmentNops: (objectMemory wordSize max: 8). entryLabel := cogit Label. + (self genGetClassObjectOf: instReg into: destReg scratchReg: scratchReg mayBeAForwarder: nil) ~= 0 ifTrue: - (self genGetClassObjectOf: instReg into: destReg scratchReg: scratchReg instRegIsReceiver: nil) ~= 0 ifTrue: [self error: 'internal error']. ^entryLabel! Item was added: + ----- Method: CogSimStackEntry>>mayBeAForwarder (in category 'comparing') ----- + mayBeAForwarder + "Receiver is not a forwarder, except in blocks with no inst var access. + For now we optimize only the case where receiver is accessed in a method." + (type == SSRegister and: + [cogit isNonForwarderReceiver: register]) ifTrue: [^false]. + ^ type ~= SSConstant! Item was added: + ----- Method: Cogit>>inBlock (in category 'accessing') ----- + inBlock + <doNotGenerate> + ^inBlock! Item was changed: ----- Method: RegisterAllocatingCogit>>genForwardersInlinedIdenticalOrNotIf: (in category 'bytecode generators') ----- genForwardersInlinedIdenticalOrNotIf: orNot | nextPC branchDescriptor unforwardRcvr argReg targetPC unforwardArg rcvrReg postBranchPC retry fixup + comparison rcvrConstant argConstant - comparison needMergeToTarget needMergeToContinue | <var: #branchDescriptor type: #'BytecodeDescriptor *'> <var: #toContinueLabel type: #'AbstractInstruction *'> <var: #toTargetLabel type: #'AbstractInstruction *'> <var: #comparison type: #'AbstractInstruction *'> <var: #retry type: #'AbstractInstruction *'> self extractMaybeBranchDescriptorInto: [ :descr :next :postBranch :target | branchDescriptor := descr. nextPC := next. postBranchPC := postBranch. targetPC := target ]. "If an operand is an annotable constant, it may be forwarded, so we need to store it into a register so the forwarder check can jump back to the comparison after unforwarding the constant. However, if one of the operand is an unnanotable constant, does not allocate a register for it (machine code will use operations on constants) and does not generate forwarder checks." + unforwardRcvr := (self ssValue: 1) mayBeAForwarder. + unforwardArg := self ssTop mayBeAForwarder. + (unforwardRcvr not and: [unforwardArg not]) + ifTrue: [^self genVanillaInlinedIdenticalOrNotIf: orNot]. + self assert: (unforwardArg or: [unforwardRcvr]). + "We use reg for non annotable constants to avoid duplicating objRef." + rcvrConstant := objectRepresentation isUnannotatableConstant: (self ssValue: 1). + argConstant := objectRepresentation isUnannotatableConstant: self ssTop. - unforwardRcvr := (self ssValue: 1) type ~= SSConstant. - unforwardArg := self ssTop type ~= SSConstant. self + allocateEqualsEqualsRegistersArgNeedsReg: argConstant not + rcvrNeedsReg: rcvrConstant not - allocateEqualsEqualsRegistersArgNeedsReg: unforwardArg - rcvrNeedsReg: unforwardRcvr into: [ :rcvr :arg | rcvrReg:= rcvr. argReg := arg ]. "If not followed by a branch, resolve to true or false." (branchDescriptor isBranchTrue or: [branchDescriptor isBranchFalse]) ifFalse: [^self + genIdenticalNoBranchArgIsConstant: argConstant + rcvrIsConstant: rcvrConstant - genIdenticalNoBranchArgIsConstant: unforwardArg not - rcvrIsConstant: unforwardRcvr not argReg: argReg rcvrReg: rcvrReg orNotIf: orNot]. self assert: (unforwardArg or: [unforwardRcvr]). self ssPop: 2. "If we had moveAllButTop: 2 volatileSimStackEntriesToRegistersPreserving: we could avoid the extra ssPop:s" self moveVolatileSimStackEntriesToRegistersPreserving: (self allocatedRegisters bitOr: (argReg = NoReg ifTrue: [self registerMaskFor: rcvrReg] ifFalse: [rcvrReg = NoReg ifTrue: [self registerMaskFor: argReg] ifFalse: [self registerMaskFor: rcvrReg and: argReg]])). retry := self Label. self ssPop: -2. + self genCmpArgIsConstant: argConstant rcvrIsConstant: rcvrConstant argReg: argReg rcvrReg: rcvrReg. - self genCmpArgIsConstant: unforwardArg not rcvrIsConstant: unforwardRcvr not argReg: argReg rcvrReg: rcvrReg. self ssPop: 2. (self fixupAt: nextPC) notAFixup "The next instruction is dead. we can skip it." ifTrue: [deadCode := true] ifFalse: [self deny: deadCode]. "push dummy value below" "self printSimStack; printSimStack: (self fixupAt: postBranchPC) mergeSimStack" "If there are merges to be performed on the forward branches we have to execute the merge code only along the path requiring that merge, and exactly once." needMergeToTarget := self mergeRequiredForJumpTo: targetPC. needMergeToContinue := self mergeRequiredForJumpTo: postBranchPC. orNot == branchDescriptor isBranchTrue ifFalse: "a == b ifTrue: ... or a ~~ b ifFalse: ... jump on equal to target pc" [fixup := needMergeToContinue ifTrue: [0] "jumps will fall-through to to-continue merge code" ifFalse: [self ensureFixupAt: postBranchPC]. comparison := self JumpZero: (needMergeToTarget ifTrue: [0] "comparison will be fixed up to to-target merge code" ifFalse: [self ensureFixupAt: targetPC])] ifTrue: "a == b ifFalse: ... or a ~~ b ifTrue: ... jump on equal to post-branch pc" [fixup := needMergeToTarget ifTrue: [0] "jumps will fall-through to to-target merge code" ifFalse: [self ensureFixupAt: targetPC]. comparison := self JumpZero: (needMergeToContinue ifTrue: [0] "comparison will be fixed up to to-continue merge code" ifFalse: [self ensureFixupAt: postBranchPC])]. "The forwarders check(s) need(s) to jump back to the comparison (retry) if a forwarder is found, else jump forward either to the next forwarder check or to the postBranch or branch target (fixup). But if there is merge code along a path, the jump must be to the merge code." (unforwardArg and: [unforwardRcvr]) ifTrue: [objectRepresentation genEnsureOopInRegNotForwarded: argReg scratchReg: TempReg jumpBackTo: retry]. objectRepresentation genEnsureOopInRegNotForwarded: (unforwardRcvr ifTrue: [rcvrReg] ifFalse: [argReg]) scratchReg: TempReg ifForwarder: retry ifNotForwarder: fixup. "If fixup is zero then the ifNotForwarder path falls through to a Label which is interpreted as either to-continue or to-target, depending on orNot == branchDescriptor isBranchTrue." orNot == branchDescriptor isBranchTrue ifFalse: "a == b ifTrue: ... or a ~~ b ifFalse: ... jump on equal to target pc" [needMergeToContinue ifTrue: "fall-through to to-continue merge code" [self Jump: (self ensureFixupAt: postBranchPC)]. needMergeToTarget ifTrue: "fixup comparison to to-target merge code" [comparison jmpTarget: self Label. self Jump: (self ensureFixupAt: targetPC)]] ifTrue: "a == b ifFalse: ... or a ~~ b ifTrue: ... jump on equal to post-branch pc" [needMergeToTarget ifTrue: "fall-through to to-target merge code" [self Jump: (self ensureFixupAt: targetPC)]. needMergeToContinue ifTrue: "fixup comparison to to-continue merge code" [comparison jmpTarget: self Label. self Jump: (self ensureFixupAt: postBranchPC)]]. deadCode ifFalse: "duplicate the merge fixup's top of stack so as to avoid a false confict." [self ssPushDesc: ((self fixupAt: nextPC) mergeSimStack at: simStackPtr + 1)]. ^0! Item was changed: ----- Method: RegisterAllocatingCogit>>genSpecialSelectorClass (in category 'bytecode generators') ----- genSpecialSelectorClass | topReg destReg scratchReg | topReg := self allocateRegForStackEntryAt: 0. destReg := self allocateRegNotConflictingWith: (self registerMaskFor: topReg). scratchReg := self allocateRegNotConflictingWith: (self registerMaskFor: topReg and: destReg). self ssTop popToReg: topReg. self asserta: (objectRepresentation genGetClassObjectOf: topReg into: destReg scratchReg: scratchReg + mayBeAForwarder: self ssTop mayBeAForwarder) ~= BadRegisterSet. - instRegIsReceiver: false) ~= BadRegisterSet. self ssPop: 1; ssPushRegister: destReg. ^0! Item was changed: ----- Method: SimpleStackBasedCogit>>genSpecialSelectorClass (in category 'bytecode generators') ----- genSpecialSelectorClass self MoveMw: 0 r: SPReg R: SendNumArgsReg. objectRepresentation genGetClassObjectOf: SendNumArgsReg into: ClassReg scratchReg: TempReg + mayBeAForwarder: true. - instRegIsReceiver: false. self MoveR: ClassReg Mw: 0 r: SPReg. ^0! Item was changed: ----- Method: SistaCogit>>genForwardersInlinedIdenticalOrNotIf: (in category 'bytecode generators') ----- genForwardersInlinedIdenticalOrNotIf: orNot "Override to count inlined branches if followed by a conditional branch. We borrow the following conditional branch's counter and when about to inline the comparison we decrement the counter (without writing it back) and if it trips simply abort the inlining, falling back to the normal send which will then continue to the conditional branch which will trip and enter the abort." | nextPC postBranchPC targetBytecodePC branchDescriptor counterReg fixup jumpEqual jumpNotEqual + counterAddress countTripped unforwardArg unforwardRcvr argReg rcvrReg regMask + rcvrConstant argConstant | - counterAddress countTripped unforwardArg unforwardRcvr argReg rcvrReg regMask | <var: #fixup type: #'BytecodeFixup *'> <var: #countTripped type: #'AbstractInstruction *'> <var: #label type: #'AbstractInstruction *'> <var: #branchDescriptor type: #'BytecodeDescriptor *'> <var: #jumpEqual type: #'AbstractInstruction *'> <var: #jumpNotEqual type: #'AbstractInstruction *'> ((coInterpreter isOptimizedMethod: methodObj) or: [needsFrame not]) ifTrue: [^super genForwardersInlinedIdenticalOrNotIf: orNot]. regMask := 0. + unforwardRcvr := (self ssValue: 1) mayBeAForwarder. + unforwardArg := self ssTop mayBeAForwarder. + (unforwardRcvr not and: [unforwardArg not]) + ifTrue: [unforwardRcvr := true. + "TODO: use genVanilla with profiling counters (not implemented). + ^self genVanillaInlinedIdenticalOrNotIf: orNot"]. + self assert: (unforwardArg or: [unforwardRcvr]). + "We use reg for non annotable constants to avoid duplicating objRef." + rcvrConstant := objectRepresentation isUnannotatableConstant: (self ssValue: 1). + argConstant := objectRepresentation isUnannotatableConstant: self ssTop. + self extractMaybeBranchDescriptorInto: [ :descr :next :postBranch :target | branchDescriptor := descr. nextPC := next. postBranchPC := postBranch. targetBytecodePC := target ]. - unforwardRcvr := (self ssValue: 1) type ~= SSConstant. - unforwardArg := self ssTop type ~= SSConstant. - "If an operand is an annotable constant, it may be forwarded, so we need to store it into a register so the forwarder check can jump back to the comparison after unforwarding the constant. However, if one of the operand is an unnanotable constant, does not allocate a register for it (machine code will use operations on constants)." self + allocateEqualsEqualsRegistersArgNeedsReg: argConstant not + rcvrNeedsReg: rcvrConstant not - allocateEqualsEqualsRegistersArgNeedsReg: unforwardArg - rcvrNeedsReg: unforwardRcvr into: [ :rcvr :arg | rcvrReg:= rcvr. argReg := arg ]. "Only interested in inlining if followed by a conditional branch." (branchDescriptor isBranchTrue or: [branchDescriptor isBranchFalse]) ifFalse: [^ self + genIdenticalNoBranchArgIsConstant: argConstant + rcvrIsConstant: rcvrConstant - genIdenticalNoBranchArgIsConstant: unforwardArg not - rcvrIsConstant: unforwardRcvr not argReg: argReg rcvrReg: rcvrReg orNotIf: orNot]. "If branching the stack must be flushed for the merge" self ssFlushTo: simStackPtr - 2. unforwardArg ifTrue: [ objectRepresentation genEnsureOopInRegNotForwarded: argReg scratchReg: TempReg ]. unforwardRcvr ifTrue: [ objectRepresentation genEnsureOopInRegNotForwarded: rcvrReg scratchReg: TempReg ]. regMask := argReg = NoReg ifTrue: [self registerMaskFor: rcvrReg] ifFalse: [rcvrReg = NoReg ifTrue: [self registerMaskFor: argReg] ifFalse: [self registerMaskFor: rcvrReg and: argReg]]. counterReg := self allocateRegNotConflictingWith: regMask. self genExecutionCountLogicInto: [ :cAddress :countTripBranch | counterAddress := cAddress. countTripped := countTripBranch ] counterReg: counterReg. + + self genCmpArgIsConstant: argConstant rcvrIsConstant: rcvrConstant argReg: argReg rcvrReg: rcvrReg. - - self assert: (unforwardArg or: [ unforwardRcvr ]). - self genCmpArgIsConstant: unforwardArg not rcvrIsConstant: unforwardRcvr not argReg: argReg rcvrReg: rcvrReg. self ssPop: 2. orNot == branchDescriptor isBranchTrue "orNot is true for ~~" ifFalse: [ fixup := (self ensureNonMergeFixupAt: postBranchPC) asUnsignedInteger. self JumpZero: (self ensureNonMergeFixupAt: targetBytecodePC) asUnsignedInteger ] ifTrue: [ fixup := (self ensureNonMergeFixupAt: targetBytecodePC) asUnsignedInteger. self JumpZero: (self ensureNonMergeFixupAt: postBranchPC) asUnsignedInteger ]. self genFallsThroughCountLogicCounterReg: counterReg counterAddress: counterAddress. self Jump: fixup. countTripped jmpTarget: self Label. "inlined version of #== ignoring the branchDescriptor if the counter trips to have normal state for the optimizer" self ssPop: -2. self genCmpArgIsConstant: unforwardArg not rcvrIsConstant: unforwardRcvr not argReg: argReg rcvrReg: rcvrReg. self ssPop: 2. "This code necessarily directly falls through the jumpIf: code which pops the top of the stack into TempReg. We therefore directly assign the result to TempReg to save one move instruction" jumpEqual := orNot ifFalse: [self JumpZero: 0] ifTrue: [self JumpNonZero: 0]. self genMoveFalseR: TempReg. jumpNotEqual := self Jump: 0. jumpEqual jmpTarget: (self genMoveTrueR: TempReg). jumpNotEqual jmpTarget: self Label. self ssPushRegister: TempReg. (self fixupAt: nextPC) notAFixup ifTrue: [ branchReachedOnlyForCounterTrip := true ]. ^ 0! Item was changed: ----- Method: SistaRegisterAllocatingCogit>>genForwardersInlinedIdenticalOrNotIf: (in category 'bytecode generators') ----- genForwardersInlinedIdenticalOrNotIf: orNot "Override to count inlined branches if followed by a conditional branch. We borrow the following conditional branch's counter and when about to inline the comparison we decrement the counter (without writing it back) and if it trips simply abort the inlining, falling back to the normal send which will then continue to the conditional branch which will trip and enter the abort." | nextPC postBranchPC targetBytecodePC branchDescriptor counterReg fixup jumpEqual jumpNotEqual + counterAddress countTripped unforwardArg unforwardRcvr argReg rcvrReg regMask + rcvrConstant argConstant | - counterAddress countTripped unforwardArg unforwardRcvr argReg rcvrReg regMask | <var: #fixup type: #'BytecodeFixup *'> <var: #countTripped type: #'AbstractInstruction *'> <var: #label type: #'AbstractInstruction *'> <var: #branchDescriptor type: #'BytecodeDescriptor *'> <var: #jumpEqual type: #'AbstractInstruction *'> <var: #jumpNotEqual type: #'AbstractInstruction *'> ((coInterpreter isOptimizedMethod: methodObj) or: [needsFrame not]) ifTrue: [^super genForwardersInlinedIdenticalOrNotIf: orNot]. regMask := 0. self extractMaybeBranchDescriptorInto: [ :descr :next :postBranch :target | branchDescriptor := descr. nextPC := next. postBranchPC := postBranch. targetBytecodePC := target ]. + unforwardRcvr := (self ssValue: 1) mayBeAForwarder. + unforwardArg := self ssTop mayBeAForwarder. + (unforwardRcvr not and: [unforwardArg not]) + ifTrue: [unforwardRcvr := true. + "TODO: use genVanilla with profiling counters (not implemented). + ^self genVanillaInlinedIdenticalOrNotIf: orNot"]. + self assert: (unforwardArg or: [unforwardRcvr]). + "We use reg for non annotable constants to avoid duplicating objRef." + rcvrConstant := objectRepresentation isUnannotatableConstant: (self ssValue: 1). + argConstant := objectRepresentation isUnannotatableConstant: self ssTop. - unforwardRcvr := (self ssValue: 1) type ~= SSConstant. - unforwardArg := self ssTop type ~= SSConstant. "If an operand is an annotable constant, it may be forwarded, so we need to store it into a register so the forwarder check can jump back to the comparison after unforwarding the constant. However, if one of the operand is an unnanotable constant, does not allocate a register for it (machine code will use operations on constants)." rcvrReg:= argReg := NoReg. self + allocateEqualsEqualsRegistersArgNeedsReg: argConstant not + rcvrNeedsReg: rcvrConstant not - allocateEqualsEqualsRegistersArgNeedsReg: unforwardArg - rcvrNeedsReg: unforwardRcvr into: [ :rcvr :arg | rcvrReg:= rcvr. argReg := arg ]. argReg ~= NoReg ifTrue: [ regMask := self registerMaskFor: argReg ]. rcvrReg ~= NoReg ifTrue: [ regMask := regMask bitOr: (self registerMaskFor: rcvrReg) ]. "Only interested in inlining if followed by a conditional branch." (branchDescriptor isBranchTrue or: [branchDescriptor isBranchFalse]) ifFalse: [^ self + genIdenticalNoBranchArgIsConstant: argConstant + rcvrIsConstant: rcvrConstant - genIdenticalNoBranchArgIsConstant: unforwardArg not - rcvrIsConstant: unforwardRcvr not argReg: argReg rcvrReg: rcvrReg orNotIf: orNot]. unforwardArg ifTrue: [ objectRepresentation genEnsureOopInRegNotForwarded: argReg scratchReg: TempReg ]. unforwardRcvr ifTrue: [ objectRepresentation genEnsureOopInRegNotForwarded: rcvrReg scratchReg: TempReg ]. counterReg := self allocateRegNotConflictingWith: regMask. self genExecutionCountLogicInto: [ :cAddress :countTripBranch | counterAddress := cAddress. countTripped := countTripBranch ] counterReg: counterReg. self assert: (unforwardArg or: [ unforwardRcvr ]). + self genCmpArgIsConstant: argConstant rcvrIsConstant: rcvrConstant argReg: argReg rcvrReg: rcvrReg. - self genCmpArgIsConstant: unforwardArg not rcvrIsConstant: unforwardRcvr not argReg: argReg rcvrReg: rcvrReg. self ssPop: 2. orNot == branchDescriptor isBranchTrue "orNot is true for ~~" ifFalse: [ fixup := (self ensureNonMergeFixupAt: postBranchPC) asUnsignedInteger. self JumpZero: (self ensureNonMergeFixupAt: targetBytecodePC) asUnsignedInteger ] ifTrue: [ fixup := (self ensureNonMergeFixupAt: targetBytecodePC) asUnsignedInteger. self JumpZero: (self ensureNonMergeFixupAt: postBranchPC) asUnsignedInteger ]. self genFallsThroughCountLogicCounterReg: counterReg counterAddress: counterAddress. self Jump: fixup. countTripped jmpTarget: self Label. "inlined version of #== ignoring the branchDescriptor if the counter trips to have normal state for the optimizer" self ssPop: -2. self genCmpArgIsConstant: unforwardArg not rcvrIsConstant: unforwardRcvr not argReg: argReg rcvrReg: rcvrReg. self ssPop: 2. "This code necessarily directly falls through the jumpIf: code which pops the top of the stack into TempReg. We therefore directly assign the result to TempReg to save one move instruction" jumpEqual := orNot ifFalse: [self JumpZero: 0] ifTrue: [self JumpNonZero: 0]. self genMoveFalseR: TempReg. jumpNotEqual := self Jump: 0. jumpEqual jmpTarget: (self genMoveTrueR: TempReg). jumpNotEqual jmpTarget: self Label. self ssPushRegister: TempReg. (self fixupAt: nextPC) notAFixup ifTrue: [ branchReachedOnlyForCounterTrip := true ]. ^ 0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genForwardersInlinedIdenticalOrNotIf: (in category 'bytecode generators') ----- genForwardersInlinedIdenticalOrNotIf: orNot | nextPC branchDescriptor unforwardRcvr argReg targetBytecodePC + unforwardArg rcvrReg rcvrConstant argConstant postBranchPC label fixup | - unforwardArg rcvrReg postBranchPC label fixup | <var: #branchDescriptor type: #'BytecodeDescriptor *'> <var: #label type: #'AbstractInstruction *'> + unforwardRcvr := (self ssValue: 1) mayBeAForwarder. + unforwardArg := self ssTop mayBeAForwarder. + (unforwardRcvr not and: [unforwardArg not]) + ifTrue: [^self genVanillaInlinedIdenticalOrNotIf: orNot]. + self assert: (unforwardArg or: [unforwardRcvr]). + "We use reg for non annotable constants to avoid duplicating objRef." + rcvrConstant := objectRepresentation isUnannotatableConstant: (self ssValue: 1). + argConstant := objectRepresentation isUnannotatableConstant: self ssTop. + self extractMaybeBranchDescriptorInto: [ :descr :next :postBranch :target | branchDescriptor := descr. nextPC := next. postBranchPC := postBranch. targetBytecodePC := target ]. - "If an operand is an annotable constant, it may be forwarded, so we need to store it into a - register so the forwarder check can jump back to the comparison after unforwarding the constant. - However, if one of the operand is an unnanotable constant, does not allocate a register for it - (machine code will use operations on constants) and does not generate forwarder checks." - unforwardRcvr := (self ssValue: 1) type ~= SSConstant. - unforwardArg := self ssTop type ~= SSConstant. - self + allocateEqualsEqualsRegistersArgNeedsReg: argConstant not + rcvrNeedsReg: rcvrConstant not - allocateEqualsEqualsRegistersArgNeedsReg: unforwardArg - rcvrNeedsReg: unforwardRcvr into: [ :rcvr :arg | rcvrReg:= rcvr. argReg := arg ]. "If not followed by a branch, resolve to true or false." (branchDescriptor isBranchTrue or: [branchDescriptor isBranchFalse]) ifFalse: [^ self + genIdenticalNoBranchArgIsConstant: argConstant + rcvrIsConstant: rcvrConstant - genIdenticalNoBranchArgIsConstant: unforwardArg not - rcvrIsConstant: unforwardRcvr not argReg: argReg rcvrReg: rcvrReg orNotIf: orNot]. "If branching the stack must be flushed for the merge" self ssFlushTo: simStackPtr - 2. label := self Label. + self genCmpArgIsConstant: argConstant rcvrIsConstant: rcvrConstant argReg: argReg rcvrReg: rcvrReg. - self genCmpArgIsConstant: unforwardArg not rcvrIsConstant: unforwardRcvr not argReg: argReg rcvrReg: rcvrReg. self ssPop: 2. "Since there is a following conditional jump bytecode (unless there is deadCode), define non-merge fixups and leave the cond bytecode to set the mergeness." (self fixupAt: nextPC) notAFixup ifTrue: "The next instruction is dead. we can skip it." [deadCode := true. self ensureFixupAt: targetBytecodePC. self ensureFixupAt: postBranchPC] ifFalse: [self deny: deadCode]. "push dummy value below" - self assert: (unforwardArg or: [unforwardRcvr]). orNot == branchDescriptor isBranchTrue "orNot is true for ~~" ifFalse: "a == b ifTrue: ... or a ~~ b ifFalse: ... jump on equal to target pc" [fixup := self ensureNonMergeFixupAt: postBranchPC. self JumpZero: (self ensureNonMergeFixupAt: targetBytecodePC)] ifTrue: "a == b ifFalse: ... or a ~~ b ifTrue: ... jump on equal to post-branch pc" [fixup := self ensureNonMergeFixupAt: targetBytecodePC. self JumpZero: (self ensureNonMergeFixupAt: postBranchPC)]. "The forwarders checks need to jump back to the comparison (label) if a forwarder is found, else jump forward either to the next forwarder check or to the postBranch or branch target (fixup)." (unforwardArg and: [unforwardRcvr]) ifTrue: [objectRepresentation genEnsureOopInRegNotForwarded: argReg scratchReg: TempReg jumpBackTo: label]. objectRepresentation genEnsureOopInRegNotForwarded: (unforwardRcvr ifTrue: [rcvrReg] ifFalse: [argReg]) scratchReg: TempReg ifForwarder: label ifNotForwarder: fixup. "Not reached, execution flow has jumped to fixup" deadCode ifFalse: [self ssPushConstant: objectMemory trueObject]. "dummy value" ^0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genInlinedIdenticalOrNotIf: (in category 'bytecode generators') ----- genInlinedIdenticalOrNotIf: orNot "Decompose code generation for #== into a common constant-folding version, + followed by a double dispatch through the objectRepresentation to a version - followed by a double dispatch throguh the objectRepresentation to a version that doesn't deal with forwarders and a version that does." | primDescriptor result | <var: #primDescriptor type: #'BytecodeDescriptor *'> primDescriptor := self generatorAt: byte0. + ((objectRepresentation isUnannotatableConstant: self ssTop) + and: [ objectRepresentation isUnannotatableConstant: (self ssValue: 1)]) ifTrue: - ((self ssTop type == SSConstant) - and: [(self ssValue: 1) type == SSConstant]) ifTrue: [self assert: primDescriptor isMapped not. result := (orNot ifFalse: [self ssTop constant = (self ssValue: 1) constant] ifTrue: [self ssTop constant ~= (self ssValue: 1) constant]) ifTrue: [objectMemory trueObject] ifFalse: [objectMemory falseObject]. self ssPop: 2. ^self ssPushConstant: result]. ^objectRepresentation genInlinedIdenticalOrNotIfGuts: orNot! Item was changed: ----- Method: StackToRegisterMappingCogit>>genSpecialSelectorClass (in category 'bytecode generators') ----- genSpecialSelectorClass | topReg | topReg := self ssTop registerOrNone. self ssPop: 1. (topReg = NoReg or: [topReg = ClassReg]) ifTrue: [self ssAllocateRequiredReg: (topReg := SendNumArgsReg) and: ClassReg] ifFalse: [self ssAllocateRequiredReg: ClassReg]. self ssPush: 1. self ssTop popToReg: topReg. objectRepresentation genGetClassObjectOf: topReg into: ClassReg scratchReg: TempReg + mayBeAForwarder: self ssTop mayBeAForwarder. - instRegIsReceiver: false. ^self ssPop: 1; ssPushRegister: ClassReg! Item was added: + ----- Method: StackToRegisterMappingCogit>>isNonForwarderReceiver: (in category 'testing') ----- + isNonForwarderReceiver: reg + "Do not inline (inBlock access)" + ^self receiverIsInReceiverResultReg + and: [inBlock == 0 "Method, rcvr may be forwarder in blocks without inst var access." + and: [reg == ReceiverResultReg]]!

1 0

[OpenSmalltalk/opensmalltalk-vm] 218e97: Fix Issue #426 - a BitBlt buffer overrun
by Nicolas Cellier 13 Sep '19

13 Sep '19

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 218e97a9b12074c69d8c189c46ae3fd3e73ef1cf https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/218e97a9b12074c69d… Author: Nicolas Cellier <nicolas.cellier.aka.nice(a)gmail.com> Date: 2019-09-13 (Fri, 13 Sep 2019) Changed paths: M src/plugins/BitBltPlugin/BitBltPlugin.c Log Message: ----------- Fix Issue #426 - a BitBlt buffer overrun

1 0

VM Maker: VMMaker.oscog-nice.2562.mcz
by commits＠source.squeak.org 13 Sep '19

13 Sep '19

Nicolas Cellier uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-nice.2562.mcz ==================== Summary ==================== Name: VMMaker.oscog-nice.2562 Author: nice Time: 13 September 2019, 7:58:12.809297 pm UUID: 86118d22-2779-3e4a-8c91-733adca6fbd1 Ancestors: VMMaker.oscog-eem.2561 Attempt to avoid fetching BitBlt source past end boundary. This happens when we preload next source word. We preload next source word when we think that first source word does not contain enough pixels to fill first dest word. But this cannot happen if first source word contains more pixels than the whole BitBlt width (bbW). Note that the temp variable startBits is 1 based, thus we can use bbW <= startBits rather than bbW < startBits to check if the whole BitBlt width fit on 1st word (both for dest nWord = 1 and src when testing the need for preload). =============== Diff against VMMaker.oscog-eem.2561 =============== Item was changed: ----- Method: BitBltSimulation>>destMaskAndPointerInit (in category 'setup') ----- destMaskAndPointerInit "Compute masks for left and right destination words" | startBits pixPerM1 endBits | <inline: true> pixPerM1 := destPPW - 1. "A mask, assuming power of two" "how many pixels in first word" startBits := destPPW - (dx bitAnd: pixPerM1). "how many pixels in last word" endBits := (dx + bbW - 1 bitAnd: pixPerM1) + 1. destMSB ifTrue: [mask1 := AllOnes >> (32 - (startBits * destDepth)). mask2 := AllOnes << (32 - (endBits * destDepth))] ifFalse: [mask1 := AllOnes << (32 - (startBits * destDepth)). mask2 := AllOnes >> (32 - (endBits * destDepth))]. self cCode: [] inSmalltalk: [mask1 := mask1 bitAnd: 16rFFFFFFFF. mask2 := mask2 bitAnd: 16rFFFFFFFF]. "determine number of words stored per line; merge masks if only 1" + bbW <= startBits - bbW < startBits ifTrue: [mask1 := mask1 bitAnd: mask2. mask2 := 0. nWords := 1] ifFalse: [nWords := bbW - startBits + pixPerM1 // destPPW + 1]. hDir := vDir := 1. "defaults for no overlap with source" "calculate byte addr and delta, based on first word of data" "Note pitch is bytes and nWords is longs, not bytes" destIndex := destBits + (dy * destPitch) + ((dx // destPPW) * 4). destDelta := destPitch * vDir - (4 * (nWords * hDir)) "byte addr delta"! Item was changed: ----- Method: BitBltSimulation>>sourceSkewAndPointerInit (in category 'setup') ----- sourceSkewAndPointerInit "This is only used when source and dest are same depth, ie, when the barrel-shift copy loop is used." | sxLowBits dxLowBits pixPerM1 startBits m1 | <inline: true> <var: 'm1' type: #'unsigned int'> self assert: (destPPW = sourcePPW and: [destMSB = sourceMSB and: [destDepth = sourceDepth]]). pixPerM1 := destPPW - 1. "A mask, assuming power of two" sxLowBits := sx bitAnd: pixPerM1. dxLowBits := dx bitAnd: pixPerM1. "how many pixels in first word" startBits := hDir > 0 ifTrue: [sourcePPW - (sx bitAnd: pixPerM1)] ifFalse: [(sx + bbW - 1 bitAnd: pixPerM1) + 1]. m1 := destMSB ifTrue: [AllOnes >> (32 - (startBits * destDepth))] ifFalse: [AllOnes << (32 - (startBits * destDepth))]. + preload := bbW <= startBits and: [(m1 bitAnd: mask1) ~= mask1]. "i.e. there are some missing bits" - preload := (m1 bitAnd: mask1) ~= mask1. "i.e. there are some missing bits" "calculate right-shift skew from source to dest" skew := destDepth * (sourceMSB ifTrue: [sxLowBits - dxLowBits] ifFalse: [dxLowBits - sxLowBits]). " -32..32 " preload ifTrue: [skew := skew < 0 ifTrue: [skew + 32] ifFalse: [skew - 32]]. "Calc byte addr and delta from longWord info" sourceIndex := sourceBits + (sy * sourcePitch) + ((sx // (32 // sourceDepth)) * 4). "calculate increments from end of 1 line to start of next" sourceDelta := (sourcePitch * vDir) - (4 * (nWords * hDir)). preload ifTrue: "Compensate for extra source word fetched" [sourceDelta := sourceDelta - (4 * hDir)]. self deny: (preload and: [skew = 0]). self assert: (skew between: -31 and: 31)!

2 1

VM Maker: VMMaker.oscog-nice.2563.mcz
by commits＠source.squeak.org 13 Sep '19

13 Sep '19

Nicolas Cellier uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-nice.2563.mcz ==================== Summary ==================== Name: VMMaker.oscog-nice.2563 Author: nice Time: 13 September 2019, 8:41:19.941297 pm UUID: 20b8d60a-fc8a-1248-acd2-57be6f3d0999 Ancestors: VMMaker.oscog-eem.2561 Attempt to avoid fetching BitBlt source past end boundary. This happens when we preload next source word. We preload next source word when we think that first source word does not contain enough pixels to fill first dest word. But this cannot happen if first source word contains more pixels than the whole BitBlt width (bbW). Note that the temp variable startBits is 1 based, thus we can use bbW <= startBits rather than bbW < startBits to check if the whole BitBlt width fit on 1st word (and bbW > startBits to check if it does not fit on 1st word). =============== Diff against VMMaker.oscog-eem.2561 =============== Item was changed: ----- Method: BitBltSimulation>>destMaskAndPointerInit (in category 'setup') ----- destMaskAndPointerInit "Compute masks for left and right destination words" | startBits pixPerM1 endBits | <inline: true> pixPerM1 := destPPW - 1. "A mask, assuming power of two" "how many pixels in first word" startBits := destPPW - (dx bitAnd: pixPerM1). "how many pixels in last word" endBits := (dx + bbW - 1 bitAnd: pixPerM1) + 1. destMSB ifTrue: [mask1 := AllOnes >> (32 - (startBits * destDepth)). mask2 := AllOnes << (32 - (endBits * destDepth))] ifFalse: [mask1 := AllOnes << (32 - (startBits * destDepth)). mask2 := AllOnes >> (32 - (endBits * destDepth))]. self cCode: [] inSmalltalk: [mask1 := mask1 bitAnd: 16rFFFFFFFF. mask2 := mask2 bitAnd: 16rFFFFFFFF]. "determine number of words stored per line; merge masks if only 1" + bbW <= startBits - bbW < startBits ifTrue: [mask1 := mask1 bitAnd: mask2. mask2 := 0. nWords := 1] ifFalse: [nWords := bbW - startBits + pixPerM1 // destPPW + 1]. hDir := vDir := 1. "defaults for no overlap with source" "calculate byte addr and delta, based on first word of data" "Note pitch is bytes and nWords is longs, not bytes" destIndex := destBits + (dy * destPitch) + ((dx // destPPW) * 4). destDelta := destPitch * vDir - (4 * (nWords * hDir)) "byte addr delta"! Item was changed: ----- Method: BitBltSimulation>>sourceSkewAndPointerInit (in category 'setup') ----- sourceSkewAndPointerInit "This is only used when source and dest are same depth, ie, when the barrel-shift copy loop is used." | sxLowBits dxLowBits pixPerM1 startBits m1 | <inline: true> <var: 'm1' type: #'unsigned int'> self assert: (destPPW = sourcePPW and: [destMSB = sourceMSB and: [destDepth = sourceDepth]]). pixPerM1 := destPPW - 1. "A mask, assuming power of two" sxLowBits := sx bitAnd: pixPerM1. dxLowBits := dx bitAnd: pixPerM1. "how many pixels in first word" startBits := hDir > 0 ifTrue: [sourcePPW - (sx bitAnd: pixPerM1)] ifFalse: [(sx + bbW - 1 bitAnd: pixPerM1) + 1]. m1 := destMSB ifTrue: [AllOnes >> (32 - (startBits * destDepth))] ifFalse: [AllOnes << (32 - (startBits * destDepth))]. + preload := bbW > startBits and: [(m1 bitAnd: mask1) ~= mask1]. "i.e. there are some missing bits" - preload := (m1 bitAnd: mask1) ~= mask1. "i.e. there are some missing bits" "calculate right-shift skew from source to dest" skew := destDepth * (sourceMSB ifTrue: [sxLowBits - dxLowBits] ifFalse: [dxLowBits - sxLowBits]). " -32..32 " preload ifTrue: [skew := skew < 0 ifTrue: [skew + 32] ifFalse: [skew - 32]]. "Calc byte addr and delta from longWord info" sourceIndex := sourceBits + (sy * sourcePitch) + ((sx // (32 // sourceDepth)) * 4). "calculate increments from end of 1 line to start of next" sourceDelta := (sourcePitch * vDir) - (4 * (nWords * hDir)). preload ifTrue: "Compensate for extra source word fetched" [sourceDelta := sourceDelta - (4 * hDir)]. self deny: (preload and: [skew = 0]). self assert: (skew between: -31 and: 31)!

1 0

Still Failing: OpenSmalltalk/opensmalltalk-vm#1808 (Cog - a3b48bd)
by Travis CI 13 Sep '19

13 Sep '19

Build Update for OpenSmalltalk/opensmalltalk-vm ------------------------------------- Build: #1808 Status: Still Failing Duration: 40 mins and 30 secs Commit: a3b48bd (Cog) Author: nicolas.cellier.aka.nice(a)gmail.com Message: force eol=lf on files used for constructing Bochs plugins [ci-skip] View the changeset: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/d7a17fdf5fac...a3… View the full build log and details: https://travis-ci.org/OpenSmalltalk/opensmalltalk-vm/builds/584672863?utm_m… -- You can unsubscribe from build emails from the OpenSmalltalk/opensmalltalk-vm repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=8795279&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

[OpenSmalltalk/opensmalltalk-vm] a3b48b: force eol=lf on files used for constructing Bochs ...
by Nicolas Cellier 13 Sep '19

13 Sep '19

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: a3b48bd211e945ebc3974a27dce9215e8c2ce7d3 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/a3b48bd211e945ebc3… Author: nicolas.cellier.aka.nice(a)gmail.com <nicolas.cellier.aka.nice(a)gmail.com> Date: 2019-09-13 (Fri, 13 Sep 2019) Changed paths: M .gitattributes Log Message: ----------- force eol=lf on files used for constructing Bochs plugins [ci-skip]

1 0

Still Failing: OpenSmalltalk/opensmalltalk-vm#1807 (Cog - d7a17fd)
by Travis CI 11 Sep '19

11 Sep '19

Build Update for OpenSmalltalk/opensmalltalk-vm ------------------------------------- Build: #1807 Status: Still Failing Duration: 42 mins and 5 secs Commit: d7a17fd (Cog) Author: Eliot Miranda Message: Cog VM source as per VMMaker.oscog-eem.2561 Fix a bug in followForwardedLiteralsIn:; whether the methodObject is young or not is important, and must be recorded. Fix Float nan comparison again... It was broken in VMMaker.oscog-nice.2557 The comment of broken method tells what it should do (and what it did), but no more what it does Fix awfull VM crash when testing [48 = $0] bench. genJumpImmediate: generates not one instruction but two (Compare + Jump). So we cannot use it as a jumpTarget (or we skip the Compare instruction!) View the changeset: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/f6d5541e6b37...d7… View the full build log and details: https://travis-ci.org/OpenSmalltalk/opensmalltalk-vm/builds/583460370?utm_m… -- You can unsubscribe from build emails from the OpenSmalltalk/opensmalltalk-vm repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=8795279&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

[OpenSmalltalk/opensmalltalk-vm] d7a17f: Cog VM source as per VMMaker.oscog-eem.2561
by Eliot Miranda 11 Sep '19

11 Sep '19

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: d7a17fdf5fac0affe6f81b65a09ea0a5bbf64455 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/d7a17fdf5fac0affe6… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2019-09-10 (Tue, 10 Sep 2019) Changed paths: M nsspur64src/vm/cogit.h M nsspur64src/vm/cogitX64SysV.c M nsspur64src/vm/cogitX64WIN64.c M nsspur64src/vm/cointerp.c M nsspur64src/vm/cointerp.h M nsspur64src/vm/gcc3x-cointerp.c M nsspursrc/vm/cogit.h M nsspursrc/vm/cogitARMv5.c M nsspursrc/vm/cogitIA32.c M nsspursrc/vm/cogitMIPSEL.c M nsspursrc/vm/cointerp.c M nsspursrc/vm/cointerp.h M nsspursrc/vm/gcc3x-cointerp.c M spur64src/vm/cogit.h M spur64src/vm/cogitX64SysV.c M spur64src/vm/cogitX64WIN64.c M spur64src/vm/cointerp.c M spur64src/vm/cointerp.h M spur64src/vm/cointerpmt.c M spur64src/vm/cointerpmt.h M spur64src/vm/gcc3x-cointerp.c M spur64src/vm/gcc3x-cointerpmt.c M spurlowcode64src/vm/cogit.h M spurlowcode64src/vm/cogitX64SysV.c M spurlowcode64src/vm/cogitX64WIN64.c M spurlowcode64src/vm/cointerp.c M spurlowcode64src/vm/cointerp.h M spurlowcode64src/vm/gcc3x-cointerp.c M spurlowcodesrc/vm/cogit.h M spurlowcodesrc/vm/cogitARMv5.c M spurlowcodesrc/vm/cogitIA32.c M spurlowcodesrc/vm/cogitMIPSEL.c M spurlowcodesrc/vm/cointerp.c M spurlowcodesrc/vm/cointerp.h M spurlowcodesrc/vm/gcc3x-cointerp.c M spursista64src/vm/cogit.h M spursista64src/vm/cogitX64SysV.c M spursista64src/vm/cogitX64WIN64.c M spursista64src/vm/cointerp.c M spursista64src/vm/cointerp.h M spursista64src/vm/gcc3x-cointerp.c M spursistasrc/vm/cogit.h M spursistasrc/vm/cogitARMv5.c M spursistasrc/vm/cogitIA32.c M spursistasrc/vm/cogitMIPSEL.c M spursistasrc/vm/cointerp.c M spursistasrc/vm/cointerp.h M spursistasrc/vm/gcc3x-cointerp.c M spursrc/vm/cogit.h M spursrc/vm/cogitARMv5.c M spursrc/vm/cogitIA32.c M spursrc/vm/cogitMIPSEL.c M spursrc/vm/cointerp.c M spursrc/vm/cointerp.h M spursrc/vm/cointerpmt.c M spursrc/vm/cointerpmt.h M spursrc/vm/gcc3x-cointerp.c M spursrc/vm/gcc3x-cointerpmt.c M src/vm/cogit.h M src/vm/cogitARMv5.c M src/vm/cogitIA32.c M src/vm/cogitMIPSEL.c M src/vm/cointerp.c M src/vm/cointerp.h M src/vm/cointerpmt.c M src/vm/cointerpmt.h M src/vm/gcc3x-cointerp.c M src/vm/gcc3x-cointerpmt.c Log Message: ----------- Cog VM source as per VMMaker.oscog-eem.2561 Fix a bug in followForwardedLiteralsIn:; whether the methodObject is young or not is important, and must be recorded. Fix Float nan comparison again... It was broken in VMMaker.oscog-nice.2557 The comment of broken method tells what it should do (and what it did), but no more what it does Fix awfull VM crash when testing [48 = $0] bench. genJumpImmediate: generates not one instruction but two (Compare + Jump). So we cannot use it as a jumpTarget (or we skip the Compare instruction!)

1 0

VM Maker: VMMaker.oscog-eem.2561.mcz
by commits＠source.squeak.org 11 Sep '19

11 Sep '19

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.2561.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.2561 Author: eem Time: 10 September 2019, 7:38:19.641414 pm UUID: 38122521-e0fd-4e4d-9903-8a99a82bac38 Ancestors: VMMaker.oscog-nice.2560 FIx a bug in followForwardedLiteralsIn:; whether the methodObject is young or not is important, and must be recorded. Simulator: Remove an inadvertent break. Save hair pulling by complaining about the alternative bytecode set if MULTIPLEBYTECODESETS is unset. Check in bytecodeSetOffsetFor:. Make sure the Cogit>>kosherYoungReferrers answers the result. =============== Diff against VMMaker.oscog-nice.2560 =============== Item was changed: ----- Method: CoInterpreter>>postBecomeAction: (in category 'object memory support') ----- postBecomeAction: theBecomeEffectsFlags "Clear the gcMode var and let the Cogit do its post GC checks." - self break. super postBecomeAction: theBecomeEffectsFlags. (objectMemory hasSpurMemoryManagerAPI) ifTrue: [cogit followMovableLiteralsAndUpdateYoungReferrers] ifFalse: [cogit cogitPostGCAction: gcMode]. self nilUncoggableMethods. self assert: cogit kosherYoungReferrers. gcMode := 0! Item was changed: ----- Method: Cogit>>bytecodeSetOffsetFor: (in category 'initialization') ----- bytecodeSetOffsetFor: aMethodObj <inline: true> ^self cppIf: MULTIPLEBYTECODESETS ifTrue: [(coInterpreter methodUsesAlternateBytecodeSet: aMethodObj) ifTrue: [256] ifFalse: [0]] + ifFalse: + [self deny: (coInterpreter methodUsesAlternateBytecodeSet: aMethodObj). + 0]! - ifFalse: [0]! Item was changed: ----- Method: Cogit>>followForwardedLiteralsIn: (in category 'garbage collection') ----- followForwardedLiteralsIn: cogMethod <api> <option: #SpurObjectMemory> <var: #cogMethod type: #'CogMethod *'> | hasYoungObj hasYoungObjPtr | self assert: (cogMethod cmType ~= CMMethod or: [(objectMemory isForwarded: cogMethod methodObject) not]). + hasYoungObj := objectMemory isYoung: cogMethod methodObject. - hasYoungObj := false. (objectMemory shouldRemapOop: cogMethod selector) ifTrue: [cogMethod selector: (objectMemory remapObj: cogMethod selector). (objectMemory isYoung: cogMethod selector) ifTrue: [hasYoungObj := true]]. hasYoungObjPtr := (self addressOf: hasYoungObj put: [:val| hasYoungObj := val]) asInteger. self mapFor: cogMethod performUntil: #remapIfObjectRef:pc:hasYoung: arg: hasYoungObjPtr. hasYoungObj ifTrue: [methodZone ensureInYoungReferrers: cogMethod] ifFalse: [cogMethod cmRefersToYoung: false]! Item was changed: ----- Method: Cogit>>kosherYoungReferrers (in category 'jit - api') ----- kosherYoungReferrers <doNotGenerate> + ^methodZone kosherYoungReferrers! - methodZone kosherYoungReferrers!

1 0

Failed: OpenSmalltalk/opensmalltalk-vm#1806 (Cog - f6d5541)
by Travis CI 11 Sep '19

11 Sep '19

Build Update for OpenSmalltalk/opensmalltalk-vm ------------------------------------- Build: #1806 Status: Failed Duration: 9 mins and 54 secs Commit: f6d5541 (Cog) Author: Eliot Miranda Message: Cog VM Source VMMaker.oscog-eem.2558 Reimplement Spur JIT access to literals and literal variables in #==, #~~ and push/pop/store literal variable. Instead of having a run-time read barrier in JITTED code, add a flag to CogMethod recordiong if a method references a movable (becommable) literal, and scanning all so flagged methods post-become to follow becommed literals. Thank you Clément for a lovely day's programming!! This reduces code size by about 2.2%. Performance increase yet to be assessed, but it should be better than 2.2% (less code, but more compact code means more methods in the method zone and a more compact working set). Doing so means we don't have to add all methods to young referrers if OldBecameNew. Instead we need add only those with movable literals which after scanning end up with a new literal. This scheme works well for 64-bits where sdelecftors are not directly referenced; instead ithe inline cache (because it is only 32-bits) contains the literal index of the selector. Add control of mixed mode arithmetic primitives, controlled by a VM flag (vmParameterAt: 48 [put:]; and perhaps by vmParameterAt: 75 [put:]). If the flag is set (unset by default), arithmetic primitives given both integral and float primitives will fail instead of coercing and completing. See Smallissimo blog post Provide primitiveHighBit (number 575). In the JIT add a new RTL OpCode ClzRR to allow very fast computation of high bit. Slang: Fix an initialization bug for classes referred to in option: pragmas but not included. Make sure that all such classes are included in InitializationOptions as false before initializing. Fix checkGenerateSurrogate:bytesPerWord: when checking for a new method. The existing code assumed no new methods were being adeed and so errored when the cmHasMovableLiteral accessors were generated and checked for. View the changeset: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/d6238b29f217...f6… View the full build log and details: https://travis-ci.org/OpenSmalltalk/opensmalltalk-vm/builds/583441471?utm_m… -- You can unsubscribe from build emails from the OpenSmalltalk/opensmalltalk-vm repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=8795279&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

← Newer
1
...
4
5
6
7
8
9
10
11
12
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev September 2019