ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/OpenCL/OpenCL.xs
(Generate patch)

Comparing OpenCL/OpenCL.xs (file contents):
Revision 1.76 by root, Sat May 5 14:49:52 2012 UTC vs.
Revision 1.80 by root, Sat May 5 16:44:02 2012 UTC

1#include <stddef.h>
2
1#include "EXTERN.h" 3#include "EXTERN.h"
2#include "perl.h" 4#include "perl.h"
3#include "XSUB.h" 5#include "XSUB.h"
4 6
5#include "ecb.h"//D 7#include "ecb.h"//D
618 xthread_t id; 620 xthread_t id;
619 thread_create (&id, build_program_thread, arg); 621 thread_create (&id, build_program_thread, arg);
620} 622}
621 623
622/*****************************************************************************/ 624/*****************************************************************************/
625/* mem object destructor notify */
626
627static void ecb_noinline
628eq_destructor_push (void *data1, void *data2, void *data3)
629{
630}
631
632static eq_vtbl eq_destructor_vtbl = { 0, eq_destructor_push };
633
634static void CL_CALLBACK
635eq_destructor_notify (cl_mem memobj, void *user_data)
636{
637 eq_enq (&eq_destructor_vtbl, (SV *)user_data, (void *)memobj, 0, 0);
638}
639
640/*****************************************************************************/
623/* event objects */ 641/* event objects */
624 642
625static void 643static void
626eq_event_push (void *data1, void *data2, void *data3) 644eq_event_push (void *data1, void *data2, void *data3)
627{ 645{
710 void *ptr; 728 void *ptr;
711 size_t cb; 729 size_t cb;
712 cl_event event; 730 cl_event event;
713 size_t row_pitch; 731 size_t row_pitch;
714 size_t slice_pitch; 732 size_t slice_pitch;
733
734 size_t element_size;
735 size_t width, height, depth;
715}; 736};
716 737
717static SV * 738static SV *
718mapped_new (HV *stash, cl_command_queue queue, cl_mem memobj, cl_map_flags flags, void *ptr, size_t cb, cl_event ev, size_t row_pitch, size_t slice_pitch) 739mapped_new (
740 HV *stash, cl_command_queue queue, cl_mem memobj, cl_map_flags flags,
741 void *ptr, size_t cb, cl_event ev,
742 size_t row_pitch, size_t slice_pitch, size_t element_size,
743 size_t width, size_t height, size_t depth
744)
719{ 745{
720 SV *data = newSV (0); 746 SV *data = newSV (0);
721 SvUPGRADE (data, SVt_PVMG); 747 SvUPGRADE (data, SVt_PVMG);
722 748
723 OpenCL__Mapped mapped; 749 OpenCL__Mapped mapped;
724 New (0, mapped, 1, struct mapped); 750 New (0, mapped, 1, struct mapped);
725 751
726 clRetainCommandQueue (queue); 752 clRetainCommandQueue (queue);
727 753
728 mapped->queue = queue; 754 mapped->queue = queue;
729 mapped->memobj = memobj; 755 mapped->memobj = memobj;
730 mapped->ptr = ptr; 756 mapped->ptr = ptr;
731 mapped->cb = cb; 757 mapped->cb = cb;
732 mapped->event = ev; 758 mapped->event = ev;
733 mapped->row_pitch = row_pitch; 759 mapped->row_pitch = row_pitch;
734 mapped->slice_pitch = slice_pitch; 760 mapped->slice_pitch = slice_pitch;
761
762 mapped->element_size = element_size;
763 mapped->width = width;
764 mapped->height = height;
765 mapped->depth = depth;
735 766
736 sv_magicext (data, 0, PERL_MAGIC_ext, 0, (char *)mapped, 0); 767 sv_magicext (data, 0, PERL_MAGIC_ext, 0, (char *)mapped, 0);
737 768
738 if (SvLEN (data)) 769 if (SvLEN (data))
739 Safefree (data); 770 Safefree (data);
780 811
781 clReleaseEvent (mapped->event); 812 clReleaseEvent (mapped->event);
782 mapped->event = ev; 813 mapped->event = ev;
783 814
784 mapped_detach (self, mapped); 815 mapped_detach (self, mapped);
816}
817
818static size_t
819mapped_element_size (OpenCL__Mapped self)
820{
821 if (!self->element_size)
822 clGetImageInfo (self->memobj, CL_IMAGE_ELEMENT_SIZE, sizeof (self->element_size), &self->element_size, 0);
823
824 return self->element_size;
785} 825}
786 826
787/*****************************************************************************/ 827/*****************************************************************************/
788 828
789MODULE = OpenCL PACKAGE = OpenCL 829MODULE = OpenCL PACKAGE = OpenCL
1025 1065
1026#BEGIN:device 1066#BEGIN:device
1027 1067
1028void 1068void
1029type (OpenCL::Device self) 1069type (OpenCL::Device self)
1070 ALIAS:
1071 type = CL_DEVICE_TYPE
1072 address_bits = CL_DEVICE_ADDRESS_BITS
1073 max_mem_alloc_size = CL_DEVICE_MAX_MEM_ALLOC_SIZE
1074 single_fp_config = CL_DEVICE_SINGLE_FP_CONFIG
1075 global_mem_cache_size = CL_DEVICE_GLOBAL_MEM_CACHE_SIZE
1076 global_mem_size = CL_DEVICE_GLOBAL_MEM_SIZE
1077 max_constant_buffer_size = CL_DEVICE_MAX_CONSTANT_BUFFER_SIZE
1078 local_mem_size = CL_DEVICE_LOCAL_MEM_SIZE
1079 execution_capabilities = CL_DEVICE_EXECUTION_CAPABILITIES
1080 properties = CL_DEVICE_QUEUE_PROPERTIES
1081 double_fp_config = CL_DEVICE_DOUBLE_FP_CONFIG
1082 half_fp_config = CL_DEVICE_HALF_FP_CONFIG
1030 PPCODE: 1083 PPCODE:
1031 cl_device_type value [1]; 1084 cl_ulong value [1];
1032 NEED_SUCCESS (GetDeviceInfo, (self, CL_DEVICE_TYPE, sizeof (value), value, 0)); 1085 NEED_SUCCESS (GetDeviceInfo, (self, ix, sizeof (value), value, 0));
1033 EXTEND (SP, 1); 1086 EXTEND (SP, 1);
1034 const int i = 0; 1087 const int i = 0;
1035 PUSHs (sv_2mortal (newSVuv (value [i]))); 1088 PUSHs (sv_2mortal (newSVuv (value [i])));
1036 1089
1037void 1090void
1051 max_write_image_args = CL_DEVICE_MAX_WRITE_IMAGE_ARGS 1104 max_write_image_args = CL_DEVICE_MAX_WRITE_IMAGE_ARGS
1052 image_support = CL_DEVICE_IMAGE_SUPPORT 1105 image_support = CL_DEVICE_IMAGE_SUPPORT
1053 max_samplers = CL_DEVICE_MAX_SAMPLERS 1106 max_samplers = CL_DEVICE_MAX_SAMPLERS
1054 mem_base_addr_align = CL_DEVICE_MEM_BASE_ADDR_ALIGN 1107 mem_base_addr_align = CL_DEVICE_MEM_BASE_ADDR_ALIGN
1055 min_data_type_align_size = CL_DEVICE_MIN_DATA_TYPE_ALIGN_SIZE 1108 min_data_type_align_size = CL_DEVICE_MIN_DATA_TYPE_ALIGN_SIZE
1109 global_mem_cache_type = CL_DEVICE_GLOBAL_MEM_CACHE_TYPE
1056 global_mem_cacheline_size = CL_DEVICE_GLOBAL_MEM_CACHELINE_SIZE 1110 global_mem_cacheline_size = CL_DEVICE_GLOBAL_MEM_CACHELINE_SIZE
1057 max_constant_args = CL_DEVICE_MAX_CONSTANT_ARGS 1111 max_constant_args = CL_DEVICE_MAX_CONSTANT_ARGS
1112 local_mem_type = CL_DEVICE_LOCAL_MEM_TYPE
1058 preferred_vector_width_half = CL_DEVICE_PREFERRED_VECTOR_WIDTH_HALF 1113 preferred_vector_width_half = CL_DEVICE_PREFERRED_VECTOR_WIDTH_HALF
1059 native_vector_width_char = CL_DEVICE_NATIVE_VECTOR_WIDTH_CHAR 1114 native_vector_width_char = CL_DEVICE_NATIVE_VECTOR_WIDTH_CHAR
1060 native_vector_width_short = CL_DEVICE_NATIVE_VECTOR_WIDTH_SHORT 1115 native_vector_width_short = CL_DEVICE_NATIVE_VECTOR_WIDTH_SHORT
1061 native_vector_width_int = CL_DEVICE_NATIVE_VECTOR_WIDTH_INT 1116 native_vector_width_int = CL_DEVICE_NATIVE_VECTOR_WIDTH_INT
1062 native_vector_width_long = CL_DEVICE_NATIVE_VECTOR_WIDTH_LONG 1117 native_vector_width_long = CL_DEVICE_NATIVE_VECTOR_WIDTH_LONG
1100 EXTEND (SP, n); 1155 EXTEND (SP, n);
1101 for (i = 0; i < n; ++i) 1156 for (i = 0; i < n; ++i)
1102 PUSHs (sv_2mortal (newSVuv (value [i]))); 1157 PUSHs (sv_2mortal (newSVuv (value [i])));
1103 1158
1104void 1159void
1105address_bits (OpenCL::Device self)
1106 PPCODE:
1107 cl_bitfield value [1];
1108 NEED_SUCCESS (GetDeviceInfo, (self, CL_DEVICE_ADDRESS_BITS, sizeof (value), value, 0));
1109 EXTEND (SP, 1);
1110 const int i = 0;
1111 PUSHs (sv_2mortal (newSVuv (value [i])));
1112
1113void
1114max_mem_alloc_size (OpenCL::Device self)
1115 ALIAS:
1116 max_mem_alloc_size = CL_DEVICE_MAX_MEM_ALLOC_SIZE
1117 global_mem_cache_size = CL_DEVICE_GLOBAL_MEM_CACHE_SIZE
1118 global_mem_size = CL_DEVICE_GLOBAL_MEM_SIZE
1119 max_constant_buffer_size = CL_DEVICE_MAX_CONSTANT_BUFFER_SIZE
1120 local_mem_size = CL_DEVICE_LOCAL_MEM_SIZE
1121 PPCODE:
1122 cl_ulong value [1];
1123 NEED_SUCCESS (GetDeviceInfo, (self, ix, sizeof (value), value, 0));
1124 EXTEND (SP, 1);
1125 const int i = 0;
1126 PUSHs (sv_2mortal (newSVuv (value [i])));
1127
1128void
1129single_fp_config (OpenCL::Device self)
1130 ALIAS:
1131 single_fp_config = CL_DEVICE_SINGLE_FP_CONFIG
1132 double_fp_config = CL_DEVICE_DOUBLE_FP_CONFIG
1133 half_fp_config = CL_DEVICE_HALF_FP_CONFIG
1134 PPCODE:
1135 cl_device_fp_config value [1];
1136 NEED_SUCCESS (GetDeviceInfo, (self, ix, sizeof (value), value, 0));
1137 EXTEND (SP, 1);
1138 const int i = 0;
1139 PUSHs (sv_2mortal (newSVuv (value [i])));
1140
1141void
1142global_mem_cache_type (OpenCL::Device self)
1143 PPCODE:
1144 cl_device_mem_cache_type value [1];
1145 NEED_SUCCESS (GetDeviceInfo, (self, CL_DEVICE_GLOBAL_MEM_CACHE_TYPE, sizeof (value), value, 0));
1146 EXTEND (SP, 1);
1147 const int i = 0;
1148 PUSHs (sv_2mortal (newSVuv (value [i])));
1149
1150void
1151local_mem_type (OpenCL::Device self)
1152 PPCODE:
1153 cl_device_local_mem_type value [1];
1154 NEED_SUCCESS (GetDeviceInfo, (self, CL_DEVICE_LOCAL_MEM_TYPE, sizeof (value), value, 0));
1155 EXTEND (SP, 1);
1156 const int i = 0;
1157 PUSHs (sv_2mortal (newSVuv (value [i])));
1158
1159void
1160error_correction_support (OpenCL::Device self) 1160error_correction_support (OpenCL::Device self)
1161 ALIAS: 1161 ALIAS:
1162 error_correction_support = CL_DEVICE_ERROR_CORRECTION_SUPPORT 1162 error_correction_support = CL_DEVICE_ERROR_CORRECTION_SUPPORT
1163 endian_little = CL_DEVICE_ENDIAN_LITTLE 1163 endian_little = CL_DEVICE_ENDIAN_LITTLE
1164 available = CL_DEVICE_AVAILABLE 1164 available = CL_DEVICE_AVAILABLE
1165 compiler_available = CL_DEVICE_COMPILER_AVAILABLE 1165 compiler_available = CL_DEVICE_COMPILER_AVAILABLE
1166 host_unified_memory = CL_DEVICE_HOST_UNIFIED_MEMORY 1166 host_unified_memory = CL_DEVICE_HOST_UNIFIED_MEMORY
1167 PPCODE: 1167 PPCODE:
1168 cl_bool value [1]; 1168 cl_uint value [1];
1169 NEED_SUCCESS (GetDeviceInfo, (self, ix, sizeof (value), value, 0)); 1169 NEED_SUCCESS (GetDeviceInfo, (self, ix, sizeof (value), value, 0));
1170 EXTEND (SP, 1); 1170 EXTEND (SP, 1);
1171 const int i = 0; 1171 const int i = 0;
1172 PUSHs (sv_2mortal (value [i] ? &PL_sv_yes : &PL_sv_no)); 1172 PUSHs (sv_2mortal (value [i] ? &PL_sv_yes : &PL_sv_no));
1173
1174void
1175execution_capabilities (OpenCL::Device self)
1176 PPCODE:
1177 cl_device_exec_capabilities value [1];
1178 NEED_SUCCESS (GetDeviceInfo, (self, CL_DEVICE_EXECUTION_CAPABILITIES, sizeof (value), value, 0));
1179 EXTEND (SP, 1);
1180 const int i = 0;
1181 PUSHs (sv_2mortal (newSVuv (value [i])));
1182
1183void
1184properties (OpenCL::Device self)
1185 PPCODE:
1186 cl_command_queue_properties value [1];
1187 NEED_SUCCESS (GetDeviceInfo, (self, CL_DEVICE_QUEUE_PROPERTIES, sizeof (value), value, 0));
1188 EXTEND (SP, 1);
1189 const int i = 0;
1190 PUSHs (sv_2mortal (newSVuv (value [i])));
1191 1173
1192void 1174void
1193platform (OpenCL::Device self) 1175platform (OpenCL::Device self)
1194 PPCODE: 1176 PPCODE:
1195 cl_platform_id value [1]; 1177 cl_platform_id value [1];
1196 NEED_SUCCESS (GetDeviceInfo, (self, CL_DEVICE_PLATFORM, sizeof (value), value, 0)); 1178 NEED_SUCCESS (GetDeviceInfo, (self, CL_DEVICE_PLATFORM, sizeof (value), value, 0));
1197 EXTEND (SP, 1); 1179 EXTEND (SP, 1);
1198 const int i = 0; 1180 const int i = 0;
1199 {
1200 PUSH_CLOBJ (stash_platform, value [i]); 1181 PUSH_CLOBJ (stash_platform, value [i]);
1201 }
1202 1182
1203void 1183void
1204name (OpenCL::Device self) 1184name (OpenCL::Device self)
1205 ALIAS: 1185 ALIAS:
1206 name = CL_DEVICE_NAME 1186 name = CL_DEVICE_NAME
1223 PPCODE: 1203 PPCODE:
1224 cl_device_id value [1]; 1204 cl_device_id value [1];
1225 NEED_SUCCESS (GetDeviceInfo, (self, CL_DEVICE_PARENT_DEVICE_EXT, sizeof (value), value, 0)); 1205 NEED_SUCCESS (GetDeviceInfo, (self, CL_DEVICE_PARENT_DEVICE_EXT, sizeof (value), value, 0));
1226 EXTEND (SP, 1); 1206 EXTEND (SP, 1);
1227 const int i = 0; 1207 const int i = 0;
1228 {
1229 PUSH_CLOBJ (stash_device, value [i]); 1208 PUSH_CLOBJ (stash_device, value [i]);
1230 }
1231 1209
1232void 1210void
1233partition_types_ext (OpenCL::Device self) 1211partition_types_ext (OpenCL::Device self)
1234 ALIAS: 1212 ALIAS:
1235 partition_types_ext = CL_DEVICE_PARTITION_TYPES_EXT 1213 partition_types_ext = CL_DEVICE_PARTITION_TYPES_EXT
1555 cl_device_id *value = tmpbuf (size); 1533 cl_device_id *value = tmpbuf (size);
1556 NEED_SUCCESS (GetContextInfo, (self, CL_CONTEXT_DEVICES, size, value, 0)); 1534 NEED_SUCCESS (GetContextInfo, (self, CL_CONTEXT_DEVICES, size, value, 0));
1557 int i, n = size / sizeof (*value); 1535 int i, n = size / sizeof (*value);
1558 EXTEND (SP, n); 1536 EXTEND (SP, n);
1559 for (i = 0; i < n; ++i) 1537 for (i = 0; i < n; ++i)
1560 {
1561 PUSH_CLOBJ (stash_device, value [i]); 1538 PUSH_CLOBJ (stash_device, value [i]);
1562 }
1563 1539
1564void 1540void
1565properties (OpenCL::Context self) 1541properties (OpenCL::Context self)
1566 PPCODE: 1542 PPCODE:
1567 size_t size; 1543 size_t size;
1888 cb -= offset; 1864 cb -= offset;
1889 } 1865 }
1890 1866
1891 cl_event ev; 1867 cl_event ev;
1892 NEED_SUCCESS_ARG (void *ptr, EnqueueMapBuffer, (self, buf, blocking, map_flags, offset, cb, event_list_count, event_list_ptr, &ev, &res)); 1868 NEED_SUCCESS_ARG (void *ptr, EnqueueMapBuffer, (self, buf, blocking, map_flags, offset, cb, event_list_count, event_list_ptr, &ev, &res));
1893 XPUSHs (mapped_new (stash_mappedbuffer, self, buf, map_flags, ptr, cb, ev, 0, 0)); 1869 XPUSHs (mapped_new (stash_mappedbuffer, self, buf, map_flags, ptr, cb, ev, 0, 0, 1, cb, 1, 1));
1894 1870
1895void 1871void
1896map_image (OpenCL::Queue self, OpenCL::Image img, cl_bool blocking = 1, cl_map_flags map_flags = CL_MAP_READ | CL_MAP_WRITE, size_t x = 0, size_t y = 0, size_t z = 0, SV *width_ = &PL_sv_undef, SV *height_ = &PL_sv_undef, SV *depth_ = &PL_sv_undef, ...) 1872map_image (OpenCL::Queue self, OpenCL::Image img, cl_bool blocking = 1, cl_map_flags map_flags = CL_MAP_READ | CL_MAP_WRITE, size_t x = 0, size_t y = 0, size_t z = 0, SV *width_ = &PL_sv_undef, SV *height_ = &PL_sv_undef, SV *depth_ = &PL_sv_undef, ...)
1897 ALIAS: 1873 ALIAS:
1898 enqueue_map_image = 0 1874 enqueue_map_image = 0
1907 size_t height = SvIV (width_); 1883 size_t height = SvIV (width_);
1908 if (!SvOK (height_)) 1884 if (!SvOK (height_))
1909 { 1885 {
1910 NEED_SUCCESS (GetImageInfo, (img, CL_IMAGE_HEIGHT, sizeof (height), &height, 0)); 1886 NEED_SUCCESS (GetImageInfo, (img, CL_IMAGE_HEIGHT, sizeof (height), &height, 0));
1911 height -= y; 1887 height -= y;
1888
1889 // stupid opencl returns 0 for depth, but requires 1 for 2d images
1890 if (!height)
1891 height = 1;
1912 } 1892 }
1913 1893
1914 size_t depth = SvIV (width_); 1894 size_t depth = SvIV (width_);
1915 if (!SvOK (depth_)) 1895 if (!SvOK (depth_))
1916 { 1896 {
1932 1912
1933 size_t cb = slice_pitch ? slice_pitch * region [2] 1913 size_t cb = slice_pitch ? slice_pitch * region [2]
1934 : row_pitch ? row_pitch * region [1] 1914 : row_pitch ? row_pitch * region [1]
1935 : region [0]; 1915 : region [0];
1936 1916
1937 XPUSHs (mapped_new (stash_mappedimage, self, img, map_flags, ptr, cb, ev, row_pitch, slice_pitch)); 1917 XPUSHs (mapped_new (stash_mappedimage, self, img, map_flags, ptr, cb, ev, row_pitch, slice_pitch, 0, width, height, depth));
1938 1918
1939void 1919void
1940unmap (OpenCL::Queue self, OpenCL::Mapped mapped, ...) 1920unmap (OpenCL::Queue self, OpenCL::Mapped mapped, ...)
1941 PPCODE: 1921 PPCODE:
1942 mapped_unmap (cv, ST (1), mapped, self, &ST (2), items - 2); 1922 mapped_unmap (cv, ST (1), mapped, self, &ST (2), items - 2);
2157 PPCODE: 2137 PPCODE:
2158 cl_context value [1]; 2138 cl_context value [1];
2159 NEED_SUCCESS (GetCommandQueueInfo, (self, CL_QUEUE_CONTEXT, sizeof (value), value, 0)); 2139 NEED_SUCCESS (GetCommandQueueInfo, (self, CL_QUEUE_CONTEXT, sizeof (value), value, 0));
2160 EXTEND (SP, 1); 2140 EXTEND (SP, 1);
2161 const int i = 0; 2141 const int i = 0;
2162 {
2163 NEED_SUCCESS (RetainContext, (value [i])); 2142 NEED_SUCCESS (RetainContext, (value [i]));
2164 PUSH_CLOBJ (stash_context, value [i]); 2143 PUSH_CLOBJ (stash_context, value [i]);
2165 }
2166 2144
2167void 2145void
2168device (OpenCL::Queue self) 2146device (OpenCL::Queue self)
2169 PPCODE: 2147 PPCODE:
2170 cl_device_id value [1]; 2148 cl_device_id value [1];
2171 NEED_SUCCESS (GetCommandQueueInfo, (self, CL_QUEUE_DEVICE, sizeof (value), value, 0)); 2149 NEED_SUCCESS (GetCommandQueueInfo, (self, CL_QUEUE_DEVICE, sizeof (value), value, 0));
2172 EXTEND (SP, 1); 2150 EXTEND (SP, 1);
2173 const int i = 0; 2151 const int i = 0;
2174 {
2175 PUSH_CLOBJ (stash_device, value [i]); 2152 PUSH_CLOBJ (stash_device, value [i]);
2176 }
2177 2153
2178void 2154void
2179reference_count (OpenCL::Queue self) 2155reference_count (OpenCL::Queue self)
2180 PPCODE: 2156 PPCODE:
2181 cl_uint value [1]; 2157 cl_uint value [1];
2185 PUSHs (sv_2mortal (newSVuv (value [i]))); 2161 PUSHs (sv_2mortal (newSVuv (value [i])));
2186 2162
2187void 2163void
2188properties (OpenCL::Queue self) 2164properties (OpenCL::Queue self)
2189 PPCODE: 2165 PPCODE:
2190 cl_command_queue_properties value [1]; 2166 cl_ulong value [1];
2191 NEED_SUCCESS (GetCommandQueueInfo, (self, CL_QUEUE_PROPERTIES, sizeof (value), value, 0)); 2167 NEED_SUCCESS (GetCommandQueueInfo, (self, CL_QUEUE_PROPERTIES, sizeof (value), value, 0));
2192 EXTEND (SP, 1); 2168 EXTEND (SP, 1);
2193 const int i = 0; 2169 const int i = 0;
2194 PUSHs (sv_2mortal (newSVuv (value [i]))); 2170 PUSHs (sv_2mortal (newSVuv (value [i])));
2195 2171
2205void 2181void
2206info (OpenCL::Memory self, cl_mem_info name) 2182info (OpenCL::Memory self, cl_mem_info name)
2207 PPCODE: 2183 PPCODE:
2208 INFO (MemObject) 2184 INFO (MemObject)
2209 2185
2186void
2187destructor_callback (OpenCL::Memory self, SV *notify)
2188 PPCODE:
2189 clSetMemObjectDestructorCallback (self, eq_destructor_notify, SvREFCNT_inc (s_get_cv (notify)));
2190
2210#BEGIN:mem 2191#BEGIN:mem
2211 2192
2212void 2193void
2213type (OpenCL::Memory self) 2194type (OpenCL::Memory self)
2195 ALIAS:
2196 type = CL_MEM_TYPE
2197 map_count = CL_MEM_MAP_COUNT
2198 reference_count = CL_MEM_REFERENCE_COUNT
2214 PPCODE: 2199 PPCODE:
2215 cl_mem_object_type value [1]; 2200 cl_uint value [1];
2216 NEED_SUCCESS (GetMemObjectInfo, (self, CL_MEM_TYPE, sizeof (value), value, 0)); 2201 NEED_SUCCESS (GetMemObjectInfo, (self, ix, sizeof (value), value, 0));
2217 EXTEND (SP, 1); 2202 EXTEND (SP, 1);
2218 const int i = 0; 2203 const int i = 0;
2219 PUSHs (sv_2mortal (newSVuv (value [i]))); 2204 PUSHs (sv_2mortal (newSVuv (value [i])));
2220 2205
2221void 2206void
2222flags (OpenCL::Memory self) 2207flags (OpenCL::Memory self)
2223 PPCODE: 2208 PPCODE:
2224 cl_mem_flags value [1]; 2209 cl_ulong value [1];
2225 NEED_SUCCESS (GetMemObjectInfo, (self, CL_MEM_FLAGS, sizeof (value), value, 0)); 2210 NEED_SUCCESS (GetMemObjectInfo, (self, CL_MEM_FLAGS, sizeof (value), value, 0));
2226 EXTEND (SP, 1); 2211 EXTEND (SP, 1);
2227 const int i = 0; 2212 const int i = 0;
2228 PUSHs (sv_2mortal (newSVuv (value [i]))); 2213 PUSHs (sv_2mortal (newSVuv (value [i])));
2229 2214
2247 EXTEND (SP, 1); 2232 EXTEND (SP, 1);
2248 const int i = 0; 2233 const int i = 0;
2249 PUSHs (sv_2mortal (newSVuv ((IV)(intptr_t)value [i]))); 2234 PUSHs (sv_2mortal (newSVuv ((IV)(intptr_t)value [i])));
2250 2235
2251void 2236void
2252map_count (OpenCL::Memory self)
2253 ALIAS:
2254 map_count = CL_MEM_MAP_COUNT
2255 reference_count = CL_MEM_REFERENCE_COUNT
2256 PPCODE:
2257 cl_uint value [1];
2258 NEED_SUCCESS (GetMemObjectInfo, (self, ix, sizeof (value), value, 0));
2259 EXTEND (SP, 1);
2260 const int i = 0;
2261 PUSHs (sv_2mortal (newSVuv (value [i])));
2262
2263void
2264context (OpenCL::Memory self) 2237context (OpenCL::Memory self)
2265 PPCODE: 2238 PPCODE:
2266 cl_context value [1]; 2239 cl_context value [1];
2267 NEED_SUCCESS (GetMemObjectInfo, (self, CL_MEM_CONTEXT, sizeof (value), value, 0)); 2240 NEED_SUCCESS (GetMemObjectInfo, (self, CL_MEM_CONTEXT, sizeof (value), value, 0));
2268 EXTEND (SP, 1); 2241 EXTEND (SP, 1);
2269 const int i = 0; 2242 const int i = 0;
2270 {
2271 NEED_SUCCESS (RetainContext, (value [i])); 2243 NEED_SUCCESS (RetainContext, (value [i]));
2272 PUSH_CLOBJ (stash_context, value [i]); 2244 PUSH_CLOBJ (stash_context, value [i]);
2273 }
2274 2245
2275void 2246void
2276associated_memobject (OpenCL::Memory self) 2247associated_memobject (OpenCL::Memory self)
2277 PPCODE: 2248 PPCODE:
2278 cl_mem value [1]; 2249 cl_mem value [1];
2279 NEED_SUCCESS (GetMemObjectInfo, (self, CL_MEM_ASSOCIATED_MEMOBJECT, sizeof (value), value, 0)); 2250 NEED_SUCCESS (GetMemObjectInfo, (self, CL_MEM_ASSOCIATED_MEMOBJECT, sizeof (value), value, 0));
2280 EXTEND (SP, 1); 2251 EXTEND (SP, 1);
2281 const int i = 0; 2252 const int i = 0;
2282 {
2283 NEED_SUCCESS (RetainMemObject, (value [i])); 2253 NEED_SUCCESS (RetainMemObject, (value [i]));
2284 PUSH_CLOBJ (stash_memory, value [i]); 2254 PUSH_CLOBJ (stash_memory, value [i]);
2285 }
2286 2255
2287#END:mem 2256#END:mem
2288 2257
2289#if cl_apple_gl_sharing || cl_khr_gl_sharing 2258#if cl_apple_gl_sharing || cl_khr_gl_sharing
2290 2259
2389 2358
2390#BEGIN:sampler 2359#BEGIN:sampler
2391 2360
2392void 2361void
2393reference_count (OpenCL::Sampler self) 2362reference_count (OpenCL::Sampler self)
2363 ALIAS:
2364 reference_count = CL_SAMPLER_REFERENCE_COUNT
2365 normalized_coords = CL_SAMPLER_NORMALIZED_COORDS
2366 addressing_mode = CL_SAMPLER_ADDRESSING_MODE
2394 PPCODE: 2367 PPCODE:
2395 cl_uint value [1]; 2368 cl_uint value [1];
2396 NEED_SUCCESS (GetSamplerInfo, (self, CL_SAMPLER_REFERENCE_COUNT, sizeof (value), value, 0)); 2369 NEED_SUCCESS (GetSamplerInfo, (self, ix, sizeof (value), value, 0));
2397 EXTEND (SP, 1); 2370 EXTEND (SP, 1);
2398 const int i = 0; 2371 const int i = 0;
2399 PUSHs (sv_2mortal (newSVuv (value [i]))); 2372 PUSHs (sv_2mortal (newSVuv (value [i])));
2400 2373
2401void 2374void
2403 PPCODE: 2376 PPCODE:
2404 cl_context value [1]; 2377 cl_context value [1];
2405 NEED_SUCCESS (GetSamplerInfo, (self, CL_SAMPLER_CONTEXT, sizeof (value), value, 0)); 2378 NEED_SUCCESS (GetSamplerInfo, (self, CL_SAMPLER_CONTEXT, sizeof (value), value, 0));
2406 EXTEND (SP, 1); 2379 EXTEND (SP, 1);
2407 const int i = 0; 2380 const int i = 0;
2408 {
2409 NEED_SUCCESS (RetainContext, (value [i])); 2381 NEED_SUCCESS (RetainContext, (value [i]));
2410 PUSH_CLOBJ (stash_context, value [i]); 2382 PUSH_CLOBJ (stash_context, value [i]);
2411 }
2412
2413void
2414normalized_coords (OpenCL::Sampler self)
2415 PPCODE:
2416 cl_addressing_mode value [1];
2417 NEED_SUCCESS (GetSamplerInfo, (self, CL_SAMPLER_NORMALIZED_COORDS, sizeof (value), value, 0));
2418 EXTEND (SP, 1);
2419 const int i = 0;
2420 PUSHs (sv_2mortal (newSVuv (value [i])));
2421
2422void
2423addressing_mode (OpenCL::Sampler self)
2424 PPCODE:
2425 cl_filter_mode value [1];
2426 NEED_SUCCESS (GetSamplerInfo, (self, CL_SAMPLER_ADDRESSING_MODE, sizeof (value), value, 0));
2427 EXTEND (SP, 1);
2428 const int i = 0;
2429 PUSHs (sv_2mortal (newSVuv (value [i])));
2430 2383
2431void 2384void
2432filter_mode (OpenCL::Sampler self) 2385filter_mode (OpenCL::Sampler self)
2433 PPCODE: 2386 PPCODE:
2434 cl_bool value [1]; 2387 cl_uint value [1];
2435 NEED_SUCCESS (GetSamplerInfo, (self, CL_SAMPLER_FILTER_MODE, sizeof (value), value, 0)); 2388 NEED_SUCCESS (GetSamplerInfo, (self, CL_SAMPLER_FILTER_MODE, sizeof (value), value, 0));
2436 EXTEND (SP, 1); 2389 EXTEND (SP, 1);
2437 const int i = 0; 2390 const int i = 0;
2438 PUSHs (sv_2mortal (value [i] ? &PL_sv_yes : &PL_sv_no)); 2391 PUSHs (sv_2mortal (value [i] ? &PL_sv_yes : &PL_sv_no));
2439 2392
2524#BEGIN:program_build 2477#BEGIN:program_build
2525 2478
2526void 2479void
2527build_status (OpenCL::Program self, OpenCL::Device device) 2480build_status (OpenCL::Program self, OpenCL::Device device)
2528 PPCODE: 2481 PPCODE:
2529 cl_build_status value [1]; 2482 cl_int value [1];
2530 NEED_SUCCESS (GetProgramBuildInfo, (self, device, CL_PROGRAM_BUILD_STATUS, sizeof (value), value, 0)); 2483 NEED_SUCCESS (GetProgramBuildInfo, (self, device, CL_PROGRAM_BUILD_STATUS, sizeof (value), value, 0));
2531 EXTEND (SP, 1); 2484 EXTEND (SP, 1);
2532 const int i = 0; 2485 const int i = 0;
2533 PUSHs (sv_2mortal (newSViv (value [i]))); 2486 PUSHs (sv_2mortal (newSViv (value [i])));
2534 2487
2547 PUSHs (sv_2mortal (newSVpv (value, 0))); 2500 PUSHs (sv_2mortal (newSVpv (value, 0)));
2548 2501
2549void 2502void
2550binary_type (OpenCL::Program self, OpenCL::Device device) 2503binary_type (OpenCL::Program self, OpenCL::Device device)
2551 PPCODE: 2504 PPCODE:
2552 cl_program_binary_type value [1]; 2505 cl_uint value [1];
2553 NEED_SUCCESS (GetProgramBuildInfo, (self, device, CL_PROGRAM_BINARY_TYPE, sizeof (value), value, 0)); 2506 NEED_SUCCESS (GetProgramBuildInfo, (self, device, CL_PROGRAM_BINARY_TYPE, sizeof (value), value, 0));
2554 EXTEND (SP, 1); 2507 EXTEND (SP, 1);
2555 const int i = 0; 2508 const int i = 0;
2556 PUSHs (sv_2mortal (newSVuv ((UV)value [i]))); 2509 PUSHs (sv_2mortal (newSVuv ((UV)value [i])));
2557 2510
2628 PPCODE: 2581 PPCODE:
2629 cl_context value [1]; 2582 cl_context value [1];
2630 NEED_SUCCESS (GetProgramInfo, (self, CL_PROGRAM_CONTEXT, sizeof (value), value, 0)); 2583 NEED_SUCCESS (GetProgramInfo, (self, CL_PROGRAM_CONTEXT, sizeof (value), value, 0));
2631 EXTEND (SP, 1); 2584 EXTEND (SP, 1);
2632 const int i = 0; 2585 const int i = 0;
2633 {
2634 NEED_SUCCESS (RetainContext, (value [i])); 2586 NEED_SUCCESS (RetainContext, (value [i]));
2635 PUSH_CLOBJ (stash_context, value [i]); 2587 PUSH_CLOBJ (stash_context, value [i]);
2636 }
2637 2588
2638void 2589void
2639devices (OpenCL::Program self) 2590devices (OpenCL::Program self)
2640 PPCODE: 2591 PPCODE:
2641 size_t size; 2592 size_t size;
2643 cl_device_id *value = tmpbuf (size); 2594 cl_device_id *value = tmpbuf (size);
2644 NEED_SUCCESS (GetProgramInfo, (self, CL_PROGRAM_DEVICES, size, value, 0)); 2595 NEED_SUCCESS (GetProgramInfo, (self, CL_PROGRAM_DEVICES, size, value, 0));
2645 int i, n = size / sizeof (*value); 2596 int i, n = size / sizeof (*value);
2646 EXTEND (SP, n); 2597 EXTEND (SP, n);
2647 for (i = 0; i < n; ++i) 2598 for (i = 0; i < n; ++i)
2648 {
2649 PUSH_CLOBJ (stash_device, value [i]); 2599 PUSH_CLOBJ (stash_device, value [i]);
2650 }
2651 2600
2652void 2601void
2653source (OpenCL::Program self) 2602source (OpenCL::Program self)
2654 PPCODE: 2603 PPCODE:
2655 size_t size; 2604 size_t size;
2866 PPCODE: 2815 PPCODE:
2867 cl_context value [1]; 2816 cl_context value [1];
2868 NEED_SUCCESS (GetKernelInfo, (self, CL_KERNEL_CONTEXT, sizeof (value), value, 0)); 2817 NEED_SUCCESS (GetKernelInfo, (self, CL_KERNEL_CONTEXT, sizeof (value), value, 0));
2869 EXTEND (SP, 1); 2818 EXTEND (SP, 1);
2870 const int i = 0; 2819 const int i = 0;
2871 {
2872 NEED_SUCCESS (RetainContext, (value [i])); 2820 NEED_SUCCESS (RetainContext, (value [i]));
2873 PUSH_CLOBJ (stash_context, value [i]); 2821 PUSH_CLOBJ (stash_context, value [i]);
2874 }
2875 2822
2876void 2823void
2877program (OpenCL::Kernel self) 2824program (OpenCL::Kernel self)
2878 PPCODE: 2825 PPCODE:
2879 cl_program value [1]; 2826 cl_program value [1];
2880 NEED_SUCCESS (GetKernelInfo, (self, CL_KERNEL_PROGRAM, sizeof (value), value, 0)); 2827 NEED_SUCCESS (GetKernelInfo, (self, CL_KERNEL_PROGRAM, sizeof (value), value, 0));
2881 EXTEND (SP, 1); 2828 EXTEND (SP, 1);
2882 const int i = 0; 2829 const int i = 0;
2883 {
2884 NEED_SUCCESS (RetainProgram, (value [i])); 2830 NEED_SUCCESS (RetainProgram, (value [i]));
2885 PUSH_CLOBJ (stash_program, value [i]); 2831 PUSH_CLOBJ (stash_program, value [i]);
2886 }
2887 2832
2888#END:kernel 2833#END:kernel
2889 2834
2890void 2835void
2891work_group_info (OpenCL::Kernel self, OpenCL::Device device, cl_kernel_work_group_info name) 2836work_group_info (OpenCL::Kernel self, OpenCL::Device device, cl_kernel_work_group_info name)
2955 2900
2956#BEGIN:kernel_arg 2901#BEGIN:kernel_arg
2957 2902
2958void 2903void
2959arg_address_qualifier (OpenCL::Kernel self, cl_uint idx) 2904arg_address_qualifier (OpenCL::Kernel self, cl_uint idx)
2905 ALIAS:
2906 arg_address_qualifier = CL_KERNEL_ARG_ADDRESS_QUALIFIER
2907 arg_access_qualifier = CL_KERNEL_ARG_ACCESS_QUALIFIER
2960 PPCODE: 2908 PPCODE:
2961 cl_kernel_arg_address_qualifier value [1]; 2909 cl_uint value [1];
2962 NEED_SUCCESS (GetKernelArgInfo, (self, idx, CL_KERNEL_ARG_ADDRESS_QUALIFIER, sizeof (value), value, 0));
2963 EXTEND (SP, 1);
2964 const int i = 0;
2965 PUSHs (sv_2mortal (newSVuv (value [i])));
2966
2967void
2968arg_access_qualifier (OpenCL::Kernel self, cl_uint idx)
2969 PPCODE:
2970 cl_kernel_arg_access_qualifier value [1];
2971 NEED_SUCCESS (GetKernelArgInfo, (self, idx, CL_KERNEL_ARG_ACCESS_QUALIFIER, sizeof (value), value, 0)); 2910 NEED_SUCCESS (GetKernelArgInfo, (self, idx, ix, sizeof (value), value, 0));
2972 EXTEND (SP, 1); 2911 EXTEND (SP, 1);
2973 const int i = 0; 2912 const int i = 0;
2974 PUSHs (sv_2mortal (newSVuv (value [i]))); 2913 PUSHs (sv_2mortal (newSVuv (value [i])));
2975 2914
2976void 2915void
2988 PUSHs (sv_2mortal (newSVpv (value, 0))); 2927 PUSHs (sv_2mortal (newSVpv (value, 0)));
2989 2928
2990void 2929void
2991arg_type_qualifier (OpenCL::Kernel self, cl_uint idx) 2930arg_type_qualifier (OpenCL::Kernel self, cl_uint idx)
2992 PPCODE: 2931 PPCODE:
2993 cl_kernel_arg_type_qualifier value [1]; 2932 cl_ulong value [1];
2994 NEED_SUCCESS (GetKernelArgInfo, (self, idx, CL_KERNEL_ARG_TYPE_QUALIFIER, sizeof (value), value, 0)); 2933 NEED_SUCCESS (GetKernelArgInfo, (self, idx, CL_KERNEL_ARG_TYPE_QUALIFIER, sizeof (value), value, 0));
2995 EXTEND (SP, 1); 2934 EXTEND (SP, 1);
2996 const int i = 0; 2935 const int i = 0;
2997 PUSHs (sv_2mortal (newSVuv (value [i]))); 2936 PUSHs (sv_2mortal (newSVuv (value [i])));
2998 2937
3029 PPCODE: 2968 PPCODE:
3030 cl_command_queue value [1]; 2969 cl_command_queue value [1];
3031 NEED_SUCCESS (GetEventInfo, (self, CL_EVENT_COMMAND_QUEUE, sizeof (value), value, 0)); 2970 NEED_SUCCESS (GetEventInfo, (self, CL_EVENT_COMMAND_QUEUE, sizeof (value), value, 0));
3032 EXTEND (SP, 1); 2971 EXTEND (SP, 1);
3033 const int i = 0; 2972 const int i = 0;
3034 {
3035 NEED_SUCCESS (RetainCommandQueue, (value [i])); 2973 NEED_SUCCESS (RetainCommandQueue, (value [i]));
3036 PUSH_CLOBJ (stash_queue, value [i]); 2974 PUSH_CLOBJ (stash_queue, value [i]);
3037 }
3038 2975
3039void 2976void
3040command_type (OpenCL::Event self) 2977command_type (OpenCL::Event self)
3041 PPCODE:
3042 cl_command_type value [1];
3043 NEED_SUCCESS (GetEventInfo, (self, CL_EVENT_COMMAND_TYPE, sizeof (value), value, 0));
3044 EXTEND (SP, 1);
3045 const int i = 0;
3046 PUSHs (sv_2mortal (newSVuv (value [i])));
3047
3048void
3049reference_count (OpenCL::Event self)
3050 ALIAS: 2978 ALIAS:
2979 command_type = CL_EVENT_COMMAND_TYPE
3051 reference_count = CL_EVENT_REFERENCE_COUNT 2980 reference_count = CL_EVENT_REFERENCE_COUNT
3052 command_execution_status = CL_EVENT_COMMAND_EXECUTION_STATUS 2981 command_execution_status = CL_EVENT_COMMAND_EXECUTION_STATUS
3053 PPCODE: 2982 PPCODE:
3054 cl_uint value [1]; 2983 cl_uint value [1];
3055 NEED_SUCCESS (GetEventInfo, (self, ix, sizeof (value), value, 0)); 2984 NEED_SUCCESS (GetEventInfo, (self, ix, sizeof (value), value, 0));
3062 PPCODE: 2991 PPCODE:
3063 cl_context value [1]; 2992 cl_context value [1];
3064 NEED_SUCCESS (GetEventInfo, (self, CL_EVENT_CONTEXT, sizeof (value), value, 0)); 2993 NEED_SUCCESS (GetEventInfo, (self, CL_EVENT_CONTEXT, sizeof (value), value, 0));
3065 EXTEND (SP, 1); 2994 EXTEND (SP, 1);
3066 const int i = 0; 2995 const int i = 0;
3067 {
3068 NEED_SUCCESS (RetainContext, (value [i])); 2996 NEED_SUCCESS (RetainContext, (value [i]));
3069 PUSH_CLOBJ (stash_context, value [i]); 2997 PUSH_CLOBJ (stash_context, value [i]);
3070 }
3071 2998
3072#END:event 2999#END:event
3073 3000
3074void 3001void
3075profiling_info (OpenCL::Event self, cl_profiling_info name) 3002profiling_info (OpenCL::Event self, cl_profiling_info name)
3140 XSRETURN_UNDEF; 3067 XSRETURN_UNDEF;
3141 3068
3142 clRetainEvent (self->event); 3069 clRetainEvent (self->event);
3143 XPUSH_CLOBJ (stash_event, self->event); 3070 XPUSH_CLOBJ (stash_event, self->event);
3144 3071
3145size_t 3072#define MAPPED_OFFSET_CB offsetof (struct mapped, cb)
3073#define MAPPED_OFFSET_ROW_PITCH offsetof (struct mapped, row_pitch)
3074#define MAPPED_OFFSET_SLICE_PITCH offsetof (struct mapped, slice_pitch)
3075#define MAPPED_OFFSET_WIDTH offsetof (struct mapped, width)
3076#define MAPPED_OFFSET_HEIGHT offsetof (struct mapped, height)
3077#define MAPPED_OFFSET_DEPTH offsetof (struct mapped, depth)
3078
3079IV
3146size (OpenCL::Mapped self) 3080size (OpenCL::Mapped self)
3081 ALIAS:
3082 size = MAPPED_OFFSET_CB
3083 row_pitch = MAPPED_OFFSET_ROW_PITCH
3084 slice_pitch = MAPPED_OFFSET_SLICE_PITCH
3085 width = MAPPED_OFFSET_WIDTH
3086 height = MAPPED_OFFSET_HEIGHT
3087 depth = MAPPED_OFFSET_DEPTH
3147 CODE: 3088 CODE:
3148 RETVAL = self->cb; 3089 RETVAL = *(size_t *)((char *)self + ix);
3149 OUTPUT: 3090 OUTPUT:
3150 RETVAL 3091 RETVAL
3151 3092
3152IV 3093IV
3153ptr (OpenCL::Mapped self) 3094ptr (OpenCL::Mapped self)
3165 if (offset + len > self->cb) 3106 if (offset + len > self->cb)
3166 croak ("OpenCL::Mapped::set out of bound condition detected"); 3107 croak ("OpenCL::Mapped::set out of bound condition detected");
3167 3108
3168 memcpy (offset + (char *)self->ptr, ptr, len); 3109 memcpy (offset + (char *)self->ptr, ptr, len);
3169 3110
3111void
3112get_row (OpenCL::Mapped self, size_t count, size_t x = 0, size_t y = 0, size_t z = 0)
3113 PPCODE:
3114 if (!SvOK (ST (1)))
3115 count = self->width - x;
3116
3117 if (x + count > self->width)
3118 croak ("OpenCL::Mapped::get: x + count crosses a row boundary");
3119
3120 if (y >= self->height)
3121 croak ("OpenCL::Mapped::get: y coordinate out of bounds");
3122
3123 if (z >= self->depth)
3124 croak ("OpenCL::Mapped::get: z coordinate out of bounds");
3125
3126 size_t element = mapped_element_size (self);
3127
3128 count *= element;
3129 x *= element;
3130
3131 char *ptr = (char *)self->ptr + x + y * self->row_pitch + z * self->slice_pitch;
3132 XPUSHs (sv_2mortal (newSVpvn (ptr, count)));
3133
3134void
3135set_row (OpenCL::Mapped self, SV *data, size_t x = 0, size_t y = 0, size_t z = 0)
3136 PPCODE:
3137 STRLEN count;
3138 char *dataptr = SvPVbyte (data, count);
3139 size_t element = mapped_element_size (self);
3140
3141 x *= element;
3142
3143 if (x + count > self->width * element)
3144 croak ("OpenCL::Mapped::set: x + data size crosses a row boundary");
3145
3146 if (y >= self->height)
3147 croak ("OpenCL::Mapped::set: y coordinate out of bounds");
3148
3149 if (z >= self->depth)
3150 croak ("OpenCL::Mapped::set: z coordinate out of bounds");
3151
3152 char *ptr = (char *)self->ptr + x + y * self->row_pitch + z * self->slice_pitch;
3153 memcpy (ptr, dataptr, count);
3154
3170MODULE = OpenCL PACKAGE = OpenCL::MappedBuffer 3155MODULE = OpenCL PACKAGE = OpenCL::MappedBuffer
3171 3156
3172MODULE = OpenCL PACKAGE = OpenCL::MappedImage 3157MODULE = OpenCL PACKAGE = OpenCL::MappedImage
3173 3158
3174IV 3159IV
3175row_pitch (OpenCL::Mapped self) 3160element_size (OpenCL::Mapped self)
3176 ALIAS:
3177 slice_pitch = 1
3178 CODE: 3161 CODE:
3179 RETVAL = ix ? self->slice_pitch : self->row_pitch; 3162 RETVAL = mapped_element_size (self);
3180 OUTPUT: 3163 OUTPUT:
3181 RETVAL 3164 RETVAL
3182 3165
3183
3184

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines