Skip to content

Commit e7304f4

Browse files
msimacekmsimacek
committed
Remove old memoryview
1 parent c9ac564 commit e7304f4

File tree

10 files changed

+391
-482
lines changed

10 files changed

+391
-482
lines changed

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinConstructors.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -152,10 +152,10 @@
152152
import com.oracle.graal.python.builtins.objects.iterator.PZip;
153153
import com.oracle.graal.python.builtins.objects.list.PList;
154154
import com.oracle.graal.python.builtins.objects.map.PMap;
155-
import com.oracle.graal.python.builtins.objects.memoryview.IntrinsifiedPMemoryView;
156155
import com.oracle.graal.python.builtins.objects.memoryview.ManagedBuffer;
157156
import com.oracle.graal.python.builtins.objects.memoryview.MemoryViewNodes;
158157
import com.oracle.graal.python.builtins.objects.memoryview.PBuffer;
158+
import com.oracle.graal.python.builtins.objects.memoryview.PMemoryView;
159159
import com.oracle.graal.python.builtins.objects.module.PythonModule;
160160
import com.oracle.graal.python.builtins.objects.object.ObjectBuiltins;
161161
import com.oracle.graal.python.builtins.objects.object.ObjectBuiltinsFactory;
@@ -3321,16 +3321,16 @@ public boolean hasSetItem(Object object) {
33213321
@Builtin(name = MEMORYVIEW, minNumOfPositionalArgs = 2, parameterNames = {"$cls", "object"}, constructsClass = PythonBuiltinClassType.PMemoryView)
33223322
@GenerateNodeFactory
33233323
public abstract static class MemoryViewNode extends PythonBuiltinNode {
3324-
public abstract IntrinsifiedPMemoryView execute(Object cls, Object object);
3324+
public abstract PMemoryView execute(Object cls, Object object);
33253325

3326-
public final IntrinsifiedPMemoryView execute(Object object) {
3326+
public final PMemoryView execute(Object object) {
33273327
return execute(PythonBuiltinClassType.PMemoryView, object);
33283328
}
33293329

33303330
// TODO arrays should support buffer protocol too, but their implementation would be
33313331
// complex, because they don't have an underlying byte array
33323332
@Specialization
3333-
IntrinsifiedPMemoryView fromBytes(@SuppressWarnings("unused") Object cls, PBytes object,
3333+
PMemoryView fromBytes(@SuppressWarnings("unused") Object cls, PBytes object,
33343334
@Shared("getQueue") @Cached MemoryViewNodes.GetBufferReferences getQueue,
33353335
@Cached SequenceNodes.GetSequenceStorageNode getSequenceStorageNode,
33363336
@Cached SequenceStorageNodes.LenNode lenNode) {
@@ -3339,7 +3339,7 @@ IntrinsifiedPMemoryView fromBytes(@SuppressWarnings("unused") Object cls, PBytes
33393339
}
33403340

33413341
@Specialization
3342-
IntrinsifiedPMemoryView fromByteArray(@SuppressWarnings("unused") Object cls, PByteArray object,
3342+
PMemoryView fromByteArray(@SuppressWarnings("unused") Object cls, PByteArray object,
33433343
@Shared("getQueue") @Cached MemoryViewNodes.GetBufferReferences getQueue,
33443344
@Cached SequenceNodes.GetSequenceStorageNode getSequenceStorageNode,
33453345
@Cached SequenceStorageNodes.LenNode lenNode) {
@@ -3348,7 +3348,7 @@ IntrinsifiedPMemoryView fromByteArray(@SuppressWarnings("unused") Object cls, PB
33483348
}
33493349

33503350
@Specialization
3351-
IntrinsifiedPMemoryView fromMemoryView(@SuppressWarnings("unused") Object cls, IntrinsifiedPMemoryView object,
3351+
PMemoryView fromMemoryView(@SuppressWarnings("unused") Object cls, PMemoryView object,
33523352
@Shared("getQueue") @Cached MemoryViewNodes.GetBufferReferences getQueue) {
33533353
object.checkReleased(this);
33543354
return factory().createMemoryView(getQueue.execute(), object.getManagedBuffer(), object.getOwner(), object.getLength(),
@@ -3358,19 +3358,19 @@ IntrinsifiedPMemoryView fromMemoryView(@SuppressWarnings("unused") Object cls, I
33583358
}
33593359

33603360
@Specialization
3361-
static IntrinsifiedPMemoryView fromNative(@SuppressWarnings("unused") Object cls, PythonAbstractNativeObject object,
3361+
static PMemoryView fromNative(@SuppressWarnings("unused") Object cls, PythonAbstractNativeObject object,
33623362
@Cached CExtNodes.ToSulongNode toSulongNode,
33633363
@Cached CExtNodes.AsPythonObjectNode asPythonObjectNode,
33643364
@Cached PCallCapiFunction callCapiFunction) {
3365-
return (IntrinsifiedPMemoryView) asPythonObjectNode.execute(callCapiFunction.call(NativeCAPISymbols.FUN_PY_TRUFFLE_MEMORYVIEW_FROM_OBJECT, toSulongNode.execute(object)));
3365+
return (PMemoryView) asPythonObjectNode.execute(callCapiFunction.call(NativeCAPISymbols.FUN_PY_TRUFFLE_MEMORYVIEW_FROM_OBJECT, toSulongNode.execute(object)));
33663366
}
33673367

33683368
@Fallback
3369-
IntrinsifiedPMemoryView error(@SuppressWarnings("unused") Object cls, Object object) {
3369+
PMemoryView error(@SuppressWarnings("unused") Object cls, Object object) {
33703370
throw raise(TypeError, ErrorMessages.MEMORYVIEW_A_BYTES_LIKE_OBJECT_REQUIRED_NOT_P, object);
33713371
}
33723372

3373-
private IntrinsifiedPMemoryView fromManaged(Object object, int itemsize, int length, boolean readonly, String format, boolean needsRelease,
3373+
private PMemoryView fromManaged(Object object, int itemsize, int length, boolean readonly, String format, boolean needsRelease,
33743374
MemoryViewNodes.BufferReferences refQueue) {
33753375
ManagedBuffer managedBuffer = null;
33763376
if (needsRelease) {
@@ -3379,7 +3379,7 @@ private IntrinsifiedPMemoryView fromManaged(Object object, int itemsize, int len
33793379
}
33803380
return factory().createMemoryView(refQueue, managedBuffer, object, length * itemsize, readonly, itemsize, format, 1,
33813381
null, 0, new int[]{length}, new int[]{itemsize}, null,
3382-
IntrinsifiedPMemoryView.FLAG_C | IntrinsifiedPMemoryView.FLAG_FORTRAN);
3382+
PMemoryView.FLAG_C | PMemoryView.FLAG_FORTRAN);
33833383
}
33843384

33853385
public static MemoryViewNode create() {

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PythonCextBuiltins.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,9 @@
180180
import com.oracle.graal.python.builtins.objects.ints.PInt;
181181
import com.oracle.graal.python.builtins.objects.iterator.PSequenceIterator;
182182
import com.oracle.graal.python.builtins.objects.list.PList;
183-
import com.oracle.graal.python.builtins.objects.memoryview.IntrinsifiedPMemoryView;
184183
import com.oracle.graal.python.builtins.objects.memoryview.ManagedBuffer;
185184
import com.oracle.graal.python.builtins.objects.memoryview.MemoryViewNodes;
185+
import com.oracle.graal.python.builtins.objects.memoryview.PMemoryView;
186186
import com.oracle.graal.python.builtins.objects.module.PythonModule;
187187
import com.oracle.graal.python.builtins.objects.object.PythonObject;
188188
import com.oracle.graal.python.builtins.objects.object.PythonObjectLibrary;
@@ -1606,7 +1606,7 @@ Object wrap(VirtualFrame frame, Object bufferStructPointer, Object ownerObj, Obj
16061606
strides[i] = castToIntNode.execute(lib.readArrayElement(stridesPointer, i));
16071607
}
16081608
} else {
1609-
strides = IntrinsifiedPMemoryView.initStridesFromShape(ndim, itemsize, shape);
1609+
strides = PMemoryView.initStridesFromShape(ndim, itemsize, shape);
16101610
}
16111611
if (!lib.isNull(suboffsetsPointer)) {
16121612
suboffsets = new int[ndim];
@@ -1621,8 +1621,8 @@ Object wrap(VirtualFrame frame, Object bufferStructPointer, Object ownerObj, Obj
16211621
if (!lib.isNull(bufferStructPointer)) {
16221622
managedBuffer = ManagedBuffer.createForNative(bufferStructPointer);
16231623
}
1624-
IntrinsifiedPMemoryView memoryview = factory().createMemoryView(getQueue.execute(), managedBuffer, owner, len, readonly, itemsize,
1625-
IntrinsifiedPMemoryView.BufferFormat.fromString(format),
1624+
PMemoryView memoryview = factory().createMemoryView(getQueue.execute(), managedBuffer, owner, len, readonly, itemsize,
1625+
PMemoryView.BufferFormat.fromString(format),
16261626
format, ndim, bufPointer, 0, shape, strides, suboffsets, flags);
16271627
return toNewRefNode.execute(memoryview);
16281628
} catch (PException e) {

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PyMemoryViewBufferWrapper.java

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import com.oracle.graal.python.PythonLanguage;
77
import com.oracle.graal.python.builtins.objects.common.SequenceNodes;
8-
import com.oracle.graal.python.builtins.objects.memoryview.IntrinsifiedPMemoryView;
8+
import com.oracle.graal.python.builtins.objects.memoryview.PMemoryView;
99
import com.oracle.graal.python.builtins.objects.object.PythonObject;
1010
import com.oracle.graal.python.nodes.SpecialMethodNames;
1111
import com.oracle.graal.python.runtime.PythonContext;
@@ -88,7 +88,7 @@ protected Object getMembers(@SuppressWarnings("unused") boolean includeInternal)
8888
protected Object readMember(String member,
8989
@CachedLibrary("this") PythonNativeWrapperLibrary lib,
9090
@Exclusive @Cached ReadFieldNode readFieldNode) throws UnknownIdentifierException {
91-
return readFieldNode.execute((IntrinsifiedPMemoryView) lib.getDelegate(this), member);
91+
return readFieldNode.execute((PMemoryView) lib.getDelegate(this), member);
9292
}
9393

9494
@GenerateUncached
@@ -112,14 +112,14 @@ static Object getShape(int[] intArray,
112112
@GenerateUncached
113113
abstract static class ReadFieldNode extends Node {
114114

115-
public abstract Object execute(IntrinsifiedPMemoryView delegate, String key) throws UnknownIdentifierException;
115+
public abstract Object execute(PMemoryView delegate, String key) throws UnknownIdentifierException;
116116

117117
protected static boolean eq(String expected, String actual) {
118118
return expected.equals(actual);
119119
}
120120

121121
@Specialization(guards = {"eq(BUF, key)", "object.getBufferPointer() == null"})
122-
static Object getBufManaged(IntrinsifiedPMemoryView object, @SuppressWarnings("unused") String key,
122+
static Object getBufManaged(PMemoryView object, @SuppressWarnings("unused") String key,
123123
@Cached SequenceNodes.GetSequenceStorageNode getStorage,
124124
@Cached SequenceNodes.SetSequenceStorageNode setStorage,
125125
@Shared("pointerAdd") @Cached CExtNodes.PointerAddNode pointerAddNode,
@@ -139,7 +139,7 @@ static Object getBufManaged(IntrinsifiedPMemoryView object, @SuppressWarnings("u
139139
}
140140

141141
@Specialization(guards = {"eq(BUF, key)", "object.getBufferPointer() != null"})
142-
static Object getBufNative(IntrinsifiedPMemoryView object, @SuppressWarnings("unused") String key,
142+
static Object getBufNative(PMemoryView object, @SuppressWarnings("unused") String key,
143143
@Shared("pointerAdd") @Cached CExtNodes.PointerAddNode pointerAddNode) {
144144
if (object.getOffset() == 0) {
145145
return object.getBufferPointer();
@@ -149,7 +149,7 @@ static Object getBufNative(IntrinsifiedPMemoryView object, @SuppressWarnings("un
149149
}
150150

151151
@Specialization(guards = {"eq(OBJ, key)"})
152-
static Object getObj(IntrinsifiedPMemoryView object, @SuppressWarnings("unused") String key,
152+
static Object getObj(PMemoryView object, @SuppressWarnings("unused") String key,
153153
@Shared("toSulong") @Cached CExtNodes.ToSulongNode toSulongNode,
154154
@Shared("getNativeNull") @Cached CExtNodes.GetNativeNullNode getNativeNullNode) {
155155
if (object.getOwner() != null) {
@@ -160,27 +160,27 @@ static Object getObj(IntrinsifiedPMemoryView object, @SuppressWarnings("unused")
160160
}
161161

162162
@Specialization(guards = {"eq(LEN, key)"})
163-
static Object getLen(IntrinsifiedPMemoryView object, @SuppressWarnings("unused") String key) {
163+
static Object getLen(PMemoryView object, @SuppressWarnings("unused") String key) {
164164
return (long) object.getLength();
165165
}
166166

167167
@Specialization(guards = {"eq(ITEMSIZE, key)"})
168-
static Object getItemsize(IntrinsifiedPMemoryView object, @SuppressWarnings("unused") String key) {
168+
static Object getItemsize(PMemoryView object, @SuppressWarnings("unused") String key) {
169169
return (long) object.getItemSize();
170170
}
171171

172172
@Specialization(guards = {"eq(NDIM, key)"})
173-
static Object getINDim(IntrinsifiedPMemoryView object, @SuppressWarnings("unused") String key) {
173+
static Object getINDim(PMemoryView object, @SuppressWarnings("unused") String key) {
174174
return object.getDimensions();
175175
}
176176

177177
@Specialization(guards = {"eq(READONLY, key)"})
178-
static Object getReadonly(IntrinsifiedPMemoryView object, @SuppressWarnings("unused") String key) {
178+
static Object getReadonly(PMemoryView object, @SuppressWarnings("unused") String key) {
179179
return object.isReadOnly() ? 1 : 0;
180180
}
181181

182182
@Specialization(guards = {"eq(FORMAT, key)"})
183-
static Object getFormat(IntrinsifiedPMemoryView object, @SuppressWarnings("unused") String key,
183+
static Object getFormat(PMemoryView object, @SuppressWarnings("unused") String key,
184184
@Cached CExtNodes.AsCharPointerNode asCharPointerNode,
185185
@Shared("toSulong") @Cached CExtNodes.ToSulongNode toSulongNode,
186186
@Shared("getNativeNull") @Cached CExtNodes.GetNativeNullNode getNativeNullNode) {
@@ -192,19 +192,19 @@ static Object getFormat(IntrinsifiedPMemoryView object, @SuppressWarnings("unuse
192192
}
193193

194194
@Specialization(guards = {"eq(SHAPE, key)"})
195-
static Object getShape(IntrinsifiedPMemoryView object, @SuppressWarnings("unused") String key,
195+
static Object getShape(PMemoryView object, @SuppressWarnings("unused") String key,
196196
@Shared("toArray") @Cached IntArrayToNativePySSizeArray intArrayToNativePySSizeArray) {
197197
return intArrayToNativePySSizeArray.execute(object.getBufferShape());
198198
}
199199

200200
@Specialization(guards = {"eq(STRIDES, key)"})
201-
static Object getStrides(IntrinsifiedPMemoryView object, @SuppressWarnings("unused") String key,
201+
static Object getStrides(PMemoryView object, @SuppressWarnings("unused") String key,
202202
@Shared("toArray") @Cached IntArrayToNativePySSizeArray intArrayToNativePySSizeArray) {
203203
return intArrayToNativePySSizeArray.execute(object.getBufferStrides());
204204
}
205205

206206
@Specialization(guards = {"eq(SUBOFFSETS, key)"})
207-
static Object getSuboffsets(IntrinsifiedPMemoryView object, @SuppressWarnings("unused") String key,
207+
static Object getSuboffsets(PMemoryView object, @SuppressWarnings("unused") String key,
208208
@Shared("toSulong") @Cached CExtNodes.ToSulongNode toSulongNode,
209209
@Shared("getNativeNull") @Cached CExtNodes.GetNativeNullNode getNativeNullNode,
210210
@Shared("toArray") @Cached IntArrayToNativePySSizeArray intArrayToNativePySSizeArray) {
@@ -216,28 +216,28 @@ static Object getSuboffsets(IntrinsifiedPMemoryView object, @SuppressWarnings("u
216216
}
217217

218218
@Specialization(guards = {"eq(INTERNAL, key)"})
219-
static Object getInternal(@SuppressWarnings("unused") IntrinsifiedPMemoryView object, @SuppressWarnings("unused") String key,
219+
static Object getInternal(@SuppressWarnings("unused") PMemoryView object, @SuppressWarnings("unused") String key,
220220
@Shared("toSulong") @Cached CExtNodes.ToSulongNode toSulongNode,
221221
@Shared("getNativeNull") @Cached CExtNodes.GetNativeNullNode getNativeNullNode) {
222222
return toSulongNode.execute(getNativeNullNode.execute());
223223
}
224224

225225
@Fallback
226-
static Object error(@SuppressWarnings("unused") IntrinsifiedPMemoryView object, String key) throws UnknownIdentifierException {
226+
static Object error(@SuppressWarnings("unused") PMemoryView object, String key) throws UnknownIdentifierException {
227227
throw UnknownIdentifierException.create(key);
228228
}
229229
}
230230

231231
@ExportMessage
232232
protected boolean isPointer(
233-
@Exclusive @Cached CExtNodes.IsPointerNode pIsPointerNode) {
233+
@Exclusive @Cached CExtNodes.IsPointerNode pIsPointerNode) {
234234
return pIsPointerNode.execute(this);
235235
}
236236

237237
@ExportMessage
238238
public long asPointer(
239-
@CachedLibrary("this") PythonNativeWrapperLibrary lib,
240-
@CachedLibrary(limit = "1") InteropLibrary interopLibrary) throws UnsupportedMessageException {
239+
@CachedLibrary("this") PythonNativeWrapperLibrary lib,
240+
@CachedLibrary(limit = "1") InteropLibrary interopLibrary) throws UnsupportedMessageException {
241241
Object nativePointer = lib.getNativePointer(this);
242242
if (nativePointer instanceof Long) {
243243
return (long) nativePointer;
@@ -247,9 +247,9 @@ public long asPointer(
247247

248248
@ExportMessage
249249
protected void toNative(
250-
@CachedLibrary("this") PythonNativeWrapperLibrary lib,
251-
@Exclusive @Cached DynamicObjectNativeWrapper.ToPyObjectNode toPyObjectNode,
252-
@Exclusive @Cached InvalidateNativeObjectsAllManagedNode invalidateNode) {
250+
@CachedLibrary("this") PythonNativeWrapperLibrary lib,
251+
@Exclusive @Cached DynamicObjectNativeWrapper.ToPyObjectNode toPyObjectNode,
252+
@Exclusive @Cached InvalidateNativeObjectsAllManagedNode invalidateNode) {
253253
invalidateNode.execute();
254254
if (!lib.isNative(this)) {
255255
setNativePointer(toPyObjectNode.execute(this));

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/DynamicObjectNativeWrapper.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@
109109
import com.oracle.graal.python.builtins.objects.function.PBuiltinFunction;
110110
import com.oracle.graal.python.builtins.objects.function.PFunction;
111111
import com.oracle.graal.python.builtins.objects.ints.PInt;
112-
import com.oracle.graal.python.builtins.objects.memoryview.IntrinsifiedPMemoryView;
113112
import com.oracle.graal.python.builtins.objects.memoryview.PBuffer;
113+
import com.oracle.graal.python.builtins.objects.memoryview.PMemoryView;
114114
import com.oracle.graal.python.builtins.objects.method.PBuiltinMethod;
115115
import com.oracle.graal.python.builtins.objects.method.PDecoratedMethod;
116116
import com.oracle.graal.python.builtins.objects.method.PMethod;
@@ -837,17 +837,17 @@ static int doBufReadonly(PBuffer object, @SuppressWarnings("unused") PythonNativ
837837
}
838838

839839
@Specialization(guards = "eq(MEMORYVIEW_FLAGS, key)")
840-
static int doMemoryViewFlags(IntrinsifiedPMemoryView object, @SuppressWarnings("unused") PythonNativeWrapper nativeWrapper, @SuppressWarnings("unused") String key) {
840+
static int doMemoryViewFlags(PMemoryView object, @SuppressWarnings("unused") PythonNativeWrapper nativeWrapper, @SuppressWarnings("unused") String key) {
841841
return object.getFlags();
842842
}
843843

844844
@Specialization(guards = "eq(MEMORYVIEW_EXPORTS, key)")
845-
static int doMemoryViewExports(IntrinsifiedPMemoryView object, @SuppressWarnings("unused") PythonNativeWrapper nativeWrapper, @SuppressWarnings("unused") String key) {
845+
static int doMemoryViewExports(PMemoryView object, @SuppressWarnings("unused") PythonNativeWrapper nativeWrapper, @SuppressWarnings("unused") String key) {
846846
return object.getExports().get();
847847
}
848848

849849
@Specialization(guards = "eq(MEMORYVIEW_VIEW, key)")
850-
static Object doMemoryViewView(IntrinsifiedPMemoryView object, @SuppressWarnings("unused") PythonNativeWrapper nativeWrapper, @SuppressWarnings("unused") String key) {
850+
static Object doMemoryViewView(PMemoryView object, @SuppressWarnings("unused") PythonNativeWrapper nativeWrapper, @SuppressWarnings("unused") String key) {
851851
return new PyMemoryViewBufferWrapper(object);
852852
}
853853

@@ -1232,8 +1232,8 @@ static Object doTpDictoffset(PythonManagedClass object, @SuppressWarnings("unuse
12321232
}
12331233

12341234
@Specialization(guards = "eq(MEMORYVIEW_EXPORTS, key)")
1235-
static Object doMemoryViewExports(IntrinsifiedPMemoryView object, @SuppressWarnings("unused") PythonNativeWrapper nativeWrapper, @SuppressWarnings("unused") String key, Object value,
1236-
@Cached CastToJavaIntExactNode cast) {
1235+
static Object doMemoryViewExports(PMemoryView object, @SuppressWarnings("unused") PythonNativeWrapper nativeWrapper, @SuppressWarnings("unused") String key, Object value,
1236+
@Cached CastToJavaIntExactNode cast) {
12371237
object.getExports().set(cast.execute(value));
12381238
return value;
12391239
}

0 commit comments

Comments
 (0)