Added Vector support for primitive methods. #68

rhys-h-walker · 2025-05-30T12:20:07Z

This PR implements the standard Vector class as well as the Vector from the Are We Fast Yet benchmarks as primitives. The Vector object is represented by VMVector for convenience, and most of Vector's methods are lowered to primitives.

Limitations

Because SOM++ is implemented as a non-recursive interpreter, primitives cannot make message sends that need to return execution to the primitive.
This means, we cannot lower any method that needs to activate a block passed as a parameter, and we can't implement #contains: and #indexOf:, because they rely on the #= message to determine equality.

src/primitives/Array.h

src/primitives/Vector.h

src/misc/Hasher.h

src/primitives/Vector.cpp

src/vmobjects/VMVector.cpp

smarr · 2025-06-17T14:04:31Z

src/vmobjects/VMVector.cpp

+vm_oop_t VMVector::RemoveObj(vm_oop_t other) {
+    const int64_t first = INT_VAL(load_ptr(this->first));
+    const int64_t last = INT_VAL(load_ptr(this->last));
+    VMArray* storage = load_ptr(this->storage);
+
+    for (int64_t i = first - 1; i < last - 1; ++i) {
+        vm_oop_t current = storage->GetIndexableField(i);
+
+        // Check where integers are tagged or references can be checked
+        if (current == other) {
+            Remove(NEW_INT(i - first + 2));  // Convert to 1-indexing
+            return load_ptr(trueObject);
+        }
+    }
+    return load_ptr(falseObject);
+}
+
+vm_oop_t VMVector::Remove(vm_oop_t inx) {
+    const int64_t first = INT_VAL(load_ptr(this->first));
+    int64_t last = INT_VAL(load_ptr(this->last));
+    VMArray* storage = load_ptr(this->storage);
+    int64_t index = INT_VAL(inx);
+
+    if ((last - first) != 0 && index == 0) {
+        index = index;
+    }
+
+    if (index < 1 || index > last - first) {
+        IndexOutOfBounds();
+    }


This code here is a bit odd. I think Remove(inx) is not used anywhere else, and allocating an int here seems unnecessary for a helper.
But the code is also too general, I think.
If this is truly only a helper for RemoveObj() (if I didn't miss anything), then it doesn't need to handle the failure case, i.e., IndexOutOfBounds

smarr

Some quick comments. Thanks!

src/primitives/Vector.cpp

src/primitivesCore/PrimitiveLoader.cpp

src/unitTests/BytecodeGenerationTest.h

- making the fields explicit makes usage easier - also need to use NEW_INT and INT_VAL macros when accessing integer values, because we use integer tagging, and in most cases, these integers are not proper objects - remove the static accessor methods in favor of direct field accesses - change constructor to take explicit arguments for first, last, and storage - this simplifies the initialization of the VMVector object - in Universe, remove the allocation of large objects in the old generation, since all VMVector objects are small, just having three fields. The storage array may be old when it is large though Signed-off-by: Stefan Marr <git@stefan-marr.de>

- initialize vectorClass correctly - fixes for the bounds checking

- #at:put: - #append: - #first - #last

…d in the Vector.som file, now only in Vector.cpp

…tly state in Vector.som

- #removeFirst - #contains: - #indexOf: - fixed indexable field bounds checking - #remove: - #asArray - #new

…ining purposes, changed name of contains to Contains for consistency

This removes #contains: and #indexOf: because they require a message send of #= to work, which means we can’t support it in the current SOM++ design. When sending the message, we yield back to the bytecode loop, which is not recursive, and thus, can’t come back to the primitive code.

- log when the vector primitives are active

…lib/Vector and load the correct primitive methods for each imeplementation

…Vector

…on primitive implementations

Signed-off-by: Stefan Marr <git@stefan-marr.de>

- doesn’t need TestWithParsing - should use #include <> for standard library Signed-off-by: Stefan Marr <git@stefan-marr.de>

Signed-off-by: Stefan Marr <git@stefan-marr.de>

- fix Main.cpp Signed-off-by: Stefan Marr <git@stefan-marr.de>

Signed-off-by: Stefan Marr <git@stefan-marr.de>

The tests can use CPPUNIT_ASSERT_EQUAL and we can reduce the number of reinterpret_casts. The helper method is also not needed, it just obscures what is tested. Signed-off-by: Stefan Marr <git@stefan-marr.de>

…nning SOM++ with --hashes flag

… and variables This is mostly to match the existing code, and avoid introducing a new style. Signed-off-by: Stefan Marr <git@stefan-marr.de>

smarr · 2025-07-08T14:52:56Z

@rhys-h-walker I just rebased this PR, and did a bit of work on the flag you added.
I had already forgotten, that we already had the printing of mismatching hashes.
So, I thought, it would instead be useful to make the flag check that there are no mismatches.
I am using this now in CI to see whether they are up to date.
Would be great if you could look at the last two commits and check whether you see any issues.

Thanks!

This allows us to use the flag in CI and check that the hashes are correct. Signed-off-by: Stefan Marr <git@stefan-marr.de>

Signed-off-by: Stefan Marr <git@stefan-marr.de>

smarr reviewed May 30, 2025

View reviewed changes

src/primitives/Array.h Outdated Show resolved Hide resolved

src/primitives/Vector.h Outdated Show resolved Hide resolved

smarr reviewed Jun 16, 2025

View reviewed changes

smarr reviewed Jun 17, 2025

View reviewed changes

smarr force-pushed the master branch 3 times, most recently from 760116b to e979852 Compare June 18, 2025 20:23

rhys-h-walker force-pushed the master branch from fa84746 to 20262f7 Compare June 20, 2025 09:40

smarr reviewed Jun 24, 2025

View reviewed changes

src/primitives/Vector.cpp Show resolved Hide resolved

src/primitives/Vector.cpp Show resolved Hide resolved

src/primitivesCore/PrimitiveLoader.cpp Outdated Show resolved Hide resolved

src/unitTests/BytecodeGenerationTest.h Outdated Show resolved Hide resolved

smarr force-pushed the master branch from 0c4de0d to a5109a3 Compare July 5, 2025 16:34

rhys-h-walker and others added 21 commits July 8, 2025 15:10

Implement Vector.som methods as primitives

dfd64bf

Fix various bugs

32a822a

- initialize vectorClass correctly - fixes for the bounds checking

Implement more Vector methods as primitives

ad84242

- #at:put: - #append: - #first - #last

Primitive methods for the Vector class no longer need to be registere…

3d52563

…d in the Vector.som file, now only in Vector.cpp

clang formatted

b6db063

Primitive methods now register for Vector without the need to explici…

469e443

…tly state in Vector.som

Implement more Vector methods as primitives

f9cc6aa

- #removeFirst - #contains: - #indexOf: - fixed indexable field bounds checking - #remove: - #asArray - #new

Fix subclassing for Vector class

efb5073

Cleanup changes

5f235b5

Moved longer methods out of header file. Smaller methods left for inl…

a502ed1

…ining purposes, changed name of contains to Contains for consistency

Updated include statements, and made method static.

7d2dbc2

More formatting changes applied

21a7e6d

Updated return type of vecAtPut

83531c9

Allow toggling of vector primitives at compilation

5bbffbb

- log when the vector primitives are active

Vector can now determine the difference between AWFY/Vector and core-…

acf82b7

…lib/Vector and load the correct primitive methods for each imeplementation

Implement #capacity and #removeAll methods as primitive for the AWFY …

94c2630

…Vector

refactors the hashing in Universe

59e47ef

Updated CI

5751c25

Updated to not register Primitives when USE_VECTOR_PRIMITIVES is false

feac71e

rhys-h-walker and others added 24 commits July 8, 2025 15:11

New hashing algorithm and unitest added

8875d87

Vector primitives now applied correctly

e9319cc

Changed to actually check the second hash

835e7a9

Actually passing clang-tidy now

64f3328

clang-tidy

a874f4c

Passing clang-tidy and fixed some comments

84abea0

Method implementations now match that of AWFY

aa6313e

Removed cout that was left

3d193bd

Updated to use a different core-lib and run Integration tests in CI

ccbdc81

Update IndexOutOfBounds in VMVector to now be in line with standard n…

9419587

…on primitive implementations

clang-tidy violations fixed and clang-format violations fixed

8c446a1

Re added defs to pass clang-tidy

ba27256

Changed again to pass clang-tidy

7c82b3b

Added version without vector primitives to benchmarking setup

df23af6

Signed-off-by: Stefan Marr <git@stefan-marr.de>

Fix double definition

3b185f2

Signed-off-by: Stefan Marr <git@stefan-marr.de>

Fix binary name in rebench

d300297

Signed-off-by: Stefan Marr <git@stefan-marr.de>

First, build and test debug version, before the release

082d7aa

Signed-off-by: Stefan Marr <git@stefan-marr.de>

Fix HashingTest definition

ac0295e

- doesn’t need TestWithParsing - should use #include <> for standard library Signed-off-by: Stefan Marr <git@stefan-marr.de>

Update Xcode project

5960e80

Signed-off-by: Stefan Marr <git@stefan-marr.de>

Added src/*.cpp to clang-tidy instructions

f3905d6

- fix Main.cpp Signed-off-by: Stefan Marr <git@stefan-marr.de>

[Extract] Disable Integration Tests

f3b3eec

Signed-off-by: Stefan Marr <git@stefan-marr.de>

Make murmur3_32 a simple function and simplify tests

30d1deb

The tests can use CPPUNIT_ASSERT_EQUAL and we can reduce the number of reinterpret_casts. The helper method is also not needed, it just obscures what is tested. Signed-off-by: Stefan Marr <git@stefan-marr.de>

Vector hashes updated to match changes. Hashes can now be shown by ru…

5b50ed4

…nning SOM++ with --hashes flag

Basic refactoring and renaming of showing hashes to -prim-hashes flag…

09b8e9c

… and variables This is mostly to match the existing code, and avoid introducing a new style. Signed-off-by: Stefan Marr <git@stefan-marr.de>

smarr force-pushed the master branch from 6943b96 to 87dc7f3 Compare July 8, 2025 14:50

Make the new flag be -prim-hash-check

2b522f0

This allows us to use the flag in CI and check that the hashes are correct. Signed-off-by: Stefan Marr <git@stefan-marr.de>

smarr force-pushed the master branch from 87dc7f3 to 2b522f0 Compare July 8, 2025 15:18

Remove unused include and use NOLINT for option

c704ef4

Signed-off-by: Stefan Marr <git@stefan-marr.de>

smarr force-pushed the master branch from a265562 to c704ef4 Compare July 8, 2025 16:57

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Added Vector support for primitive methods. #68

Added Vector support for primitive methods. #68

Uh oh!

rhys-h-walker commented May 30, 2025 •

edited by smarr

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

smarr Jun 17, 2025

Uh oh!

smarr left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

smarr commented Jul 8, 2025

Uh oh!

Uh oh!

Added Vector support for primitive methods. #68

Are you sure you want to change the base?

Added Vector support for primitive methods. #68

Uh oh!

Conversation

rhys-h-walker commented May 30, 2025 • edited by smarr Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Limitations

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

smarr Jun 17, 2025

Choose a reason for hiding this comment

Uh oh!

smarr left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

smarr commented Jul 8, 2025

Uh oh!

Uh oh!

rhys-h-walker commented May 30, 2025 •

edited by smarr

Loading