Adapted CPUMemoryBuffer to support new Velocity buffers.

m4rs-mt · Sep 26, 2023 · c5ca0bb · c5ca0bb
1 parent 63433e3
commit c5ca0bb
Showing 1 changed file with 19 additions and 6 deletions.
diff --git a/Src/ILGPU/Runtime/CPU/CPUMemoryBuffer.cs b/Src/ILGPU/Runtime/CPU/CPUMemoryBuffer.cs
@@ -92,8 +92,12 @@ public static void CPUCopyFrom<T>(
             in ArrayView<T> targetView)
             where T : unmanaged
         {
-            if (targetView.GetAcceleratorType() != AcceleratorType.CPU)
+            switch (targetView.GetAcceleratorType())
             {
+                case AcceleratorType.CPU:
+                case AcceleratorType.Velocity:
+                    break;
+                default:
                 throw new NotSupportedException(
                     RuntimeErrorMessages.NotSupportedTargetAccelerator);
             }
@@ -107,6 +111,7 @@ public static void CPUCopyFrom<T>(
             switch (sourceView.GetAcceleratorType())
             {
                 case AcceleratorType.CPU:
+                case AcceleratorType.Velocity:
                     // Copy from CPU to CPU
                     CPUCopyToCPU(
                         ref sourceView.LoadEffectiveAddress(),
@@ -157,10 +162,14 @@ public static void CPUCopyTo<T>(
             in ArrayView<T> targetView)
             where T : unmanaged
         {
-            if (sourceView.GetAcceleratorType() != AcceleratorType.CPU)
+            switch (sourceView.GetAcceleratorType())
             {
-                throw new NotSupportedException(
-                    RuntimeErrorMessages.NotSupportedTargetAccelerator);
+                case AcceleratorType.CPU:
+                case AcceleratorType.Velocity:
+                    break;
+                default:
+                    throw new NotSupportedException(
+                        RuntimeErrorMessages.NotSupportedTargetAccelerator);
             }
             if (targetView.Length > sourceView.Length)
                 throw new ArgumentOutOfRangeException(nameof(sourceView));
@@ -172,6 +181,7 @@ public static void CPUCopyTo<T>(
             switch (targetView.GetAcceleratorType())
             {
                 case AcceleratorType.CPU:
+                case AcceleratorType.Velocity:
                     // Copy from CPU to CPU
                     CPUCopyToCPU(
                         ref sourceView.LoadEffectiveAddress(),
@@ -223,11 +233,14 @@ public static void CPUCopy<T>(
             in ArrayView<T> targetView)
             where T : unmanaged
         {
-            if (sourceView.GetAcceleratorType() == AcceleratorType.CPU)
+            if (sourceView.GetAcceleratorType() == AcceleratorType.CPU ||
+                sourceView.GetAcceleratorType() == AcceleratorType.Velocity)
             {
                 CPUCopyTo(stream, sourceView, targetView);
             }
-            else if (targetView.GetAcceleratorType() == AcceleratorType.CPU)
+            else if (
+                targetView.GetAcceleratorType() == AcceleratorType.CPU ||
+                sourceView.GetAcceleratorType() == AcceleratorType.Velocity)
             {
                 CPUCopyFrom(stream, sourceView, targetView);
             }