Merge lp://staging/~kraiskil/pocl/device-name into lp://staging/~pocl/pocl/trunk
Proposed by
Kalle Raiskila
| Status: | Merged |
|---|---|
| Merged at revision: | 744 |
| Proposed branch: | lp://staging/~kraiskil/pocl/device-name |
| Merge into: | lp://staging/~pocl/pocl/trunk |
| Diff against target: |
302 lines (+74/-30) 14 files modified
lib/CL/clBuildProgram.c (+2/-2) lib/CL/clCreateKernel.c (+1/-1) lib/CL/clEnqueueNDRangeKernel.c (+2/-2) lib/CL/clGetDeviceInfo.c (+1/-1) lib/CL/devices/basic/basic.h (+2/-1) lib/CL/devices/cellspu/cellspu.h (+2/-1) lib/CL/devices/cpuinfo.c (+49/-10) lib/CL/devices/devices.c (+1/-1) lib/CL/devices/pthread/pocl-pthread.h (+2/-1) lib/CL/devices/tce/ttasim/ttasim.cc (+6/-6) lib/CL/devices/tce/ttasim/ttasim.h (+2/-1) lib/CL/pocl_cl.h (+2/-1) tests/tce/fp16/host.cpp (+1/-1) tests/tce/ttasim/host.cpp (+1/-1) |
| To merge this branch: | bzr merge lp://staging/~kraiskil/pocl/device-name |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Pekka Jääskeläinen | Approve | ||
|
Review via email:
|
|||
Commit message
Expand the device's "name" field to include info about the processor.
Description of the change
Expand the device's "name" field to include info about the processor. This matches the defacto standard set by other OCL implementations. pthreads + basic parse the /proc/cpuinfo for the description, tta adds the .adf filename. Mac is undone, as I don't have access to a working one at this time.
The metheod of selecting the available devices with POCL_DEVICES is unchaged.
To post a comment you must log in.
Revision history for this message
| Pekka Jääskeläinen (pekka-jaaskelainen) wrote | # |
review:
Needs Fixing
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Looks good except for some stylistic white space issues:
This function is quite packed, needs more white spaces according to
the surrounding style:
+pocl_cpuinfo_
+ if (adf!=NULL && *adf!=NULL) adf++;
->
if (adf != NULL && *adf != NULL) adf++;