Improving Performance Portability in OpenCL Programs