Mesa (master): radeonsi: initial WIP SI code
Tom Stellard
tstellar at kemper.freedesktop.org
Fri Apr 13 15:17:40 UTC 2012
Module: Mesa
Branch: master
Commit: a75c6163e605f35b14f26930dd9227e4f337ec9e
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a75c6163e605f35b14f26930dd9227e4f337ec9e
Author: Tom Stellard <thomas.stellard at amd.com>
Date: Fri Jan 6 17:38:37 2012 -0500
radeonsi: initial WIP SI code
This commit adds initial support for acceleration
on SI chips. egltri is starting to work.
The SI/R600 llvm backend is currently included in mesa
but that may change in the future.
The plan is to write a single gallium driver and
use gallium to support X acceleration.
This commit contains patches from:
Tom Stellard <thomas.stellard at amd.com>
Michel Dänzer <michel.daenzer at amd.com>
Alex Deucher <alexander.deucher at amd.com>
Vadim Girlin <vadimgirlin at gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
The following commits were squashed in:
======================================================================
radeonsi: Remove unused winsys pointer
This was removed from r600g in commit:
commit 96d882939d612fcc8332f107befec470ed4359de
Author: Marek Olšák <maraeo at gmail.com>
Date: Fri Feb 17 01:49:49 2012 +0100
gallium: remove unused winsys pointers in pipe_screen and pipe_context
A winsys is already a private object of a driver.
======================================================================
radeonsi: Copy color clamping CAPs from r600
Not sure if the values of these CAPS are correct for radeonsi, but the
same changed were made to r600g in commit:
commit bc1c8369384b5e16547c5bf9728aa78f8dfd66cc
Author: Marek Olšák <maraeo at gmail.com>
Date: Mon Jan 23 03:11:17 2012 +0100
st/mesa: do vertex and fragment color clamping in shaders
For ARB_color_buffer_float. Most hardware can't do it and st/mesa is
the perfect place for a fallback.
The exceptions are:
- r500 (vertex clamp only)
- nv50 (both)
- nvc0 (both)
- softpipe (both)
We also have to take into account that r300 can do CLAMPED vertex colors only,
while r600 can do UNCLAMPED vertex colors only. The difference can be expressed
with the two new CAPs.
======================================================================
radeonsi: Remove PIPE_CAP_OUTPUT_READ
This CAP was dropped in commit:
commit 04e324008759282728a95a1394bac2c4c2a1a3f9
Author: Marek Olšák <maraeo at gmail.com>
Date: Thu Feb 23 23:44:36 2012 +0100
gallium: remove PIPE_SHADER_CAP_OUTPUT_READ
r600g is the only driver which has made use of it. The reason the CAP was
added was to fix some piglit tests when the GLSL pass lower_output_reads
didn't exist.
However, not removing output reads breaks the fallback for glClampColorARB,
which assumes outputs are not readable. The fix would be non-trivial
and my personal preference is to remove the CAP, considering that reading
outputs is uncommon and that we can now use lower_output_reads to fix
the issue that the CAP was supposed to workaround in the first place.
======================================================================
radeonsi: Add missing parameters to rws->buffer_get_tiling() call
This was changed in commit:
commit c0c979eebc076b95cc8d18a013ce2968fe6311ad
Author: Jerome Glisse <jglisse at redhat.com>
Date: Mon Jan 30 17:22:13 2012 -0500
r600g: add support for common surface allocator for tiling v13
Tiled surface have all kind of alignment constraint that needs to
be met. Instead of having all this code duplicated btw ddx and
mesa use common code in libdrm_radeon this also ensure that both
ddx and mesa compute those alignment in the same way.
v2 fix evergreen
v3 fix compressed texture and workaround cube texture issue by
disabling 2D array mode for cubemap (need to check if r7xx and
newer are also affected by the issue)
v4 fix texture array
v5 fix evergreen and newer, split surface values computation from
mipmap tree generation so that we can get them directly from the
ddx
v6 final fix to evergreen tile split value
v7 fix mipmap offset to avoid to use random value, use color view
depth view to address different layer as hardware is doing some
magic rotation depending on the layer
v8 fix COLOR_VIEW on r6xx for linear array mode, use COLOR_VIEW on
evergreen, align bytes per pixel to a multiple of a dword
v9 fix handling of stencil on evergreen, half fix for compressed
texture
v10 fix evergreen compressed texture proper support for stencil
tile split. Fix stencil issue when array mode was clear by
the kernel, always program stencil bo. On evergreen depth
buffer bo need to be big enough to hold depth buffer + stencil
buffer as even with stencil disabled things get written there.
v11 rebase on top of mesa, fix pitch issue with 1d surface on evergreen,
old ddx overestimate those. Fix linear case when pitch*height < 64.
Fix r300g.
v12 Fix linear case when pitch*height < 64 for old path, adapt to
libdrm API change
v13 add libdrm check
Signed-off-by: Jerome Glisse <jglisse at redhat.com>
======================================================================
radeonsi: Remove PIPE_TRANSFER_MAP_PERMANENTLY
This was removed in commit:
commit 62f44f670bb0162e89fd4786af877f8da9ff607c
Author: Marek Olšák <maraeo at gmail.com>
Date: Mon Mar 5 13:45:00 2012 +0100
Revert "gallium: add flag PIPE_TRANSFER_MAP_PERMANENTLY"
This reverts commit 0950086376b1c8b7fb89eda81ed7f2f06dee58bc.
It was decided to refactor the transfer API instead of adding workarounds
to address the performance issues.
======================================================================
radeonsi: Handle PIPE_VIDEO_CAP_PREFERED_FORMAT.
Reintroduced in commit 9d9afcb5bac2931d4b8e6d1aa571e941c5110c90.
======================================================================
radeonsi: nuke the fallback for vertex and fragment color clamping
Ported from r600g commit c2b800cf38b299c1ab1c53dc0e4ea00c7acef853.
======================================================================
radeonsi: don't expose transform_feedback2 without kernel support
Ported from r600g commit 15146fd1bcbb08e44a1cbb984440ee1a5de63d48.
======================================================================
radeonsi: Handle PIPE_CAP_GLSL_FEATURE_LEVEL.
Ported from r600g part of commit 171be755223d99f8cc5cc1bdaf8bd7b4caa04b4f.
======================================================================
radeonsi: set minimum point size to 1.0 for non-sprite non-aa points.
Ported from r600g commit f183cc9ce3ad1d043bdf8b38fd519e8f437714fc.
======================================================================
radeonsi: rework and consolidate stencilref state setting.
Ported from r600g commit a2361946e782b57f0c63587841ca41c0ea707070.
======================================================================
radeonsi: cleanup setting DB_SHADER_CONTROL.
Ported from r600g commit 3d061caaed13b646ff40754f8ebe73f3d4983c5b.
======================================================================
radeonsi: Get rid of register masks.
Ported from r600g commits
3d061caaed13b646ff40754f8ebe73f3d4983c5b..9344ab382a1765c1a7c2560e771485edf4954fe2.
======================================================================
radeonsi: get rid of r600_context_reg.
Ported from r600g commits
9344ab382a1765c1a7c2560e771485edf4954fe2..bed20f02a771f43e1c5092254705701c228cfa7f.
======================================================================
radeonsi: Fix regression from 'Get rid of register masks'.
======================================================================
radeonsi: optimize r600_resource_va.
Ported from r600g commit 669d8766ff3403938794eb80d7769347b6e52174.
======================================================================
radeonsi: remove u8,u16,u32,u64 types.
Ported from r600g commit 78293b99b23268e6698f1267aaf40647c17d95a5.
======================================================================
radeonsi: merge r600_context with r600_pipe_context.
Ported from r600g commit e4340c1908a6a3b09e1a15d5195f6da7d00494d0.
======================================================================
radeonsi: Miscellaneous context cleanups.
Ported from r600g commits
e4340c1908a6a3b09e1a15d5195f6da7d00494d0..621e0db71c5ddcb379171064a4f720c9cf01e888.
======================================================================
radeonsi: add a new simple API for state emission.
Ported from r600g commits
621e0db71c5ddcb379171064a4f720c9cf01e888..f661405637bba32c2cfbeecf6e2e56e414e9521e.
======================================================================
radeonsi: Also remove sbu_flags member of struct r600_reg.
Requires using sid.h instead of r600d.h for the new CP_COHER_CNTL definitions,
so some code needs to be disabled for now.
======================================================================
radeonsi: Miscellaneous simplifications.
Ported from r600g commits 38bf2763482b4f1b6d95cd51aecec75601d8b90f and
b0337b679ad4c2feae59215104cfa60b58a619d5.
======================================================================
radeonsi: Handle PIPE_CAP_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION.
Ported from commit 8b4f7b0672d663273310fffa9490ad996f5b914a.
======================================================================
radeonsi: Use a fake reloc to sleep for fences.
Ported from r600g commit 8cd03b933cf868ff867e2db4a0937005a02fd0e4.
======================================================================
radeonsi: adapt to get_query_result interface change.
Ported from r600g commit 4445e170bee23a3607ece0e010adef7058ac6a11.
---
Android.mk | 4 +-
configs/autoconf.in | 6 +
configure.ac | 17 +
include/pci_ids/pci_id_driver_map.h | 7 +
include/pci_ids/radeonsi_pci_ids.h | 40 +
src/egl/main/Android.mk | 7 +-
src/gallium/Android.mk | 7 +-
src/gallium/SConscript | 2 +
src/gallium/drivers/Makefile.am | 13 +-
src/gallium/drivers/radeon/AMDGPU.h | 47 +
src/gallium/drivers/radeon/AMDGPUConstants.pm | 44 +
src/gallium/drivers/radeon/AMDGPUConvertToISA.cpp | 65 +
src/gallium/drivers/radeon/AMDGPUGenInstrEnums.pl | 126 +
.../drivers/radeon/AMDGPUGenShaderPatterns.pl | 30 +
src/gallium/drivers/radeon/AMDGPUISelLowering.cpp | 31 +
src/gallium/drivers/radeon/AMDGPUISelLowering.h | 35 +
src/gallium/drivers/radeon/AMDGPUInstrInfo.cpp | 116 +
src/gallium/drivers/radeon/AMDGPUInstrInfo.h | 59 +
src/gallium/drivers/radeon/AMDGPUInstructions.td | 90 +
src/gallium/drivers/radeon/AMDGPUIntrinsics.td | 56 +
.../radeon/AMDGPULowerShaderInstructions.cpp | 38 +
.../drivers/radeon/AMDGPULowerShaderInstructions.h | 40 +
src/gallium/drivers/radeon/AMDGPURegisterInfo.cpp | 24 +
src/gallium/drivers/radeon/AMDGPURegisterInfo.h | 38 +
src/gallium/drivers/radeon/AMDGPURegisterInfo.td | 22 +
.../radeon/AMDGPUReorderPreloadInstructions.cpp | 66 +
src/gallium/drivers/radeon/AMDGPUTargetMachine.cpp | 180 +
src/gallium/drivers/radeon/AMDGPUTargetMachine.h | 62 +
src/gallium/drivers/radeon/AMDGPUUtil.cpp | 127 +
src/gallium/drivers/radeon/AMDGPUUtil.h | 49 +
src/gallium/drivers/radeon/AMDIL.h | 292 +
src/gallium/drivers/radeon/AMDIL.td | 19 +
src/gallium/drivers/radeon/AMDIL789IOExpansion.cpp | 723 ++
src/gallium/drivers/radeon/AMDIL7XXDevice.cpp | 157 +
src/gallium/drivers/radeon/AMDIL7XXDevice.h | 77 +
src/gallium/drivers/radeon/AMDIL7XXIOExpansion.cpp | 548 ++
src/gallium/drivers/radeon/AMDILAlgorithms.tpp | 93 +
src/gallium/drivers/radeon/AMDILAsmBackend.cpp | 82 +
src/gallium/drivers/radeon/AMDILAsmBackend.h | 49 +
src/gallium/drivers/radeon/AMDILAsmPrinter7XX.cpp | 149 +
src/gallium/drivers/radeon/AMDILAsmPrinterEG.cpp | 162 +
src/gallium/drivers/radeon/AMDILBarrierDetect.cpp | 254 +
src/gallium/drivers/radeon/AMDILBase.td | 104 +
.../drivers/radeon/AMDILCFGStructurizer.cpp | 3257 +++++++++
src/gallium/drivers/radeon/AMDILCallingConv.td | 75 +
src/gallium/drivers/radeon/AMDILCodeEmitter.h | 46 +
src/gallium/drivers/radeon/AMDILCompilerErrors.h | 75 +
src/gallium/drivers/radeon/AMDILCompilerWarnings.h | 31 +
src/gallium/drivers/radeon/AMDILConversions.td | 1022 +++
src/gallium/drivers/radeon/AMDILDevice.cpp | 137 +
src/gallium/drivers/radeon/AMDILDevice.h | 132 +
src/gallium/drivers/radeon/AMDILDeviceInfo.cpp | 87 +
src/gallium/drivers/radeon/AMDILDeviceInfo.h | 89 +
src/gallium/drivers/radeon/AMDILDevices.h | 19 +
src/gallium/drivers/radeon/AMDILEGIOExpansion.cpp | 1093 +++
src/gallium/drivers/radeon/AMDILELFWriterInfo.cpp | 71 +
src/gallium/drivers/radeon/AMDILELFWriterInfo.h | 54 +
src/gallium/drivers/radeon/AMDILEnumeratedTypes.td | 522 ++
.../drivers/radeon/AMDILEvergreenDevice.cpp | 211 +
src/gallium/drivers/radeon/AMDILEvergreenDevice.h | 93 +
src/gallium/drivers/radeon/AMDILFormats.td | 450 ++
src/gallium/drivers/radeon/AMDILFrameLowering.cpp | 53 +
src/gallium/drivers/radeon/AMDILFrameLowering.h | 46 +
src/gallium/drivers/radeon/AMDILGlobalManager.cpp | 1353 ++++
src/gallium/drivers/radeon/AMDILGlobalManager.h | 256 +
src/gallium/drivers/radeon/AMDILIOExpansion.cpp | 1160 +++
src/gallium/drivers/radeon/AMDILIOExpansion.h | 320 +
src/gallium/drivers/radeon/AMDILISelDAGToDAG.cpp | 457 ++
src/gallium/drivers/radeon/AMDILISelLowering.cpp | 5612 ++++++++++++++
src/gallium/drivers/radeon/AMDILISelLowering.h | 527 ++
src/gallium/drivers/radeon/AMDILImageExpansion.cpp | 171 +
src/gallium/drivers/radeon/AMDILInliner.cpp | 271 +
src/gallium/drivers/radeon/AMDILInstrInfo.cpp | 709 ++
src/gallium/drivers/radeon/AMDILInstrInfo.h | 175 +
src/gallium/drivers/radeon/AMDILInstrInfo.td | 115 +
src/gallium/drivers/radeon/AMDILInstrPatterns.td | 66 +
src/gallium/drivers/radeon/AMDILInstructions.td | 2436 +++++++
src/gallium/drivers/radeon/AMDILIntrinsicInfo.cpp | 190 +
src/gallium/drivers/radeon/AMDILIntrinsicInfo.h | 49 +
src/gallium/drivers/radeon/AMDILIntrinsics.td | 705 ++
src/gallium/drivers/radeon/AMDILKernel.h | 84 +
src/gallium/drivers/radeon/AMDILKernelManager.cpp | 1356 ++++
src/gallium/drivers/radeon/AMDILKernelManager.h | 177 +
src/gallium/drivers/radeon/AMDILLiteralManager.cpp | 128 +
src/gallium/drivers/radeon/AMDILMCCodeEmitter.cpp | 158 +
.../drivers/radeon/AMDILMachineFunctionInfo.cpp | 597 ++
.../drivers/radeon/AMDILMachineFunctionInfo.h | 422 ++
.../drivers/radeon/AMDILMachinePeephole.cpp | 173 +
src/gallium/drivers/radeon/AMDILModuleInfo.cpp | 1266 ++++
src/gallium/drivers/radeon/AMDILModuleInfo.h | 159 +
src/gallium/drivers/radeon/AMDILMultiClass.td | 1440 ++++
src/gallium/drivers/radeon/AMDILNIDevice.cpp | 71 +
src/gallium/drivers/radeon/AMDILNIDevice.h | 59 +
src/gallium/drivers/radeon/AMDILNodes.td | 325 +
src/gallium/drivers/radeon/AMDILOperands.td | 37 +
src/gallium/drivers/radeon/AMDILPatterns.td | 504 ++
.../drivers/radeon/AMDILPeepholeOptimizer.cpp | 1211 +++
src/gallium/drivers/radeon/AMDILPointerManager.cpp | 2551 +++++++
src/gallium/drivers/radeon/AMDILPointerManager.h | 209 +
src/gallium/drivers/radeon/AMDILPrintfConvert.cpp | 293 +
src/gallium/drivers/radeon/AMDILProfiles.td | 174 +
src/gallium/drivers/radeon/AMDILRegisterInfo.cpp | 200 +
src/gallium/drivers/radeon/AMDILRegisterInfo.h | 91 +
src/gallium/drivers/radeon/AMDILRegisterInfo.td | 964 +++
src/gallium/drivers/radeon/AMDILSIDevice.cpp | 49 +
src/gallium/drivers/radeon/AMDILSIDevice.h | 45 +
src/gallium/drivers/radeon/AMDILSubtarget.cpp | 179 +
src/gallium/drivers/radeon/AMDILSubtarget.h | 75 +
src/gallium/drivers/radeon/AMDILTargetMachine.cpp | 195 +
src/gallium/drivers/radeon/AMDILTargetMachine.h | 75 +
src/gallium/drivers/radeon/AMDILTokenDesc.td | 120 +
.../drivers/radeon/AMDILUtilityFunctions.cpp | 683 ++
src/gallium/drivers/radeon/AMDILUtilityFunctions.h | 362 +
src/gallium/drivers/radeon/AMDILVersion.td | 75 +
src/gallium/drivers/radeon/LICENSE.TXT | 43 +
.../drivers/radeon/MCTargetDesc/AMDILMCAsmInfo.cpp | 107 +
.../drivers/radeon/MCTargetDesc/AMDILMCAsmInfo.h | 30 +
.../radeon/MCTargetDesc/AMDILMCTargetDesc.cpp | 66 +
.../radeon/MCTargetDesc/AMDILMCTargetDesc.h | 36 +
src/gallium/drivers/radeon/Makefile | 77 +
src/gallium/drivers/radeon/Makefile.sources | 86 +
src/gallium/drivers/radeon/Processors.td | 28 +
src/gallium/drivers/radeon/R600CodeEmitter.cpp | 776 ++
src/gallium/drivers/radeon/R600GenRegisterInfo.pl | 171 +
src/gallium/drivers/radeon/R600ISelLowering.cpp | 102 +
src/gallium/drivers/radeon/R600ISelLowering.h | 40 +
src/gallium/drivers/radeon/R600InstrFormats.td | 16 +
src/gallium/drivers/radeon/R600InstrInfo.cpp | 109 +
src/gallium/drivers/radeon/R600InstrInfo.h | 74 +
src/gallium/drivers/radeon/R600Instructions.td | 931 +++
src/gallium/drivers/radeon/R600Intrinsics.td | 40 +
.../drivers/radeon/R600KernelParameters.cpp | 503 ++
src/gallium/drivers/radeon/R600KernelParameters.h | 28 +
.../drivers/radeon/R600LowerInstructions.cpp | 546 ++
.../drivers/radeon/R600LowerShaderInstructions.cpp | 143 +
src/gallium/drivers/radeon/R600OpenCLUtils.h | 49 +
src/gallium/drivers/radeon/R600RegisterInfo.cpp | 102 +
src/gallium/drivers/radeon/R600RegisterInfo.h | 44 +
src/gallium/drivers/radeon/R600Schedule.td | 34 +
src/gallium/drivers/radeon/SIAssignInterpRegs.cpp | 110 +
src/gallium/drivers/radeon/SICodeEmitter.cpp | 274 +
src/gallium/drivers/radeon/SIConvertToISA.cpp | 89 +
src/gallium/drivers/radeon/SIGenRegisterInfo.pl | 278 +
src/gallium/drivers/radeon/SIISelLowering.cpp | 151 +
src/gallium/drivers/radeon/SIISelLowering.h | 44 +
src/gallium/drivers/radeon/SIInstrFormats.td | 128 +
src/gallium/drivers/radeon/SIInstrInfo.cpp | 173 +
src/gallium/drivers/radeon/SIInstrInfo.h | 95 +
src/gallium/drivers/radeon/SIInstrInfo.td | 472 ++
src/gallium/drivers/radeon/SIInstructions.td | 962 +++
src/gallium/drivers/radeon/SIIntrinsics.td | 34 +
.../drivers/radeon/SILowerShaderInstructions.cpp | 90 +
.../drivers/radeon/SIMachineFunctionInfo.cpp | 62 +
src/gallium/drivers/radeon/SIMachineFunctionInfo.h | 36 +
src/gallium/drivers/radeon/SIPropagateImmReads.cpp | 71 +
src/gallium/drivers/radeon/SIRegisterInfo.cpp | 66 +
src/gallium/drivers/radeon/SIRegisterInfo.h | 46 +
src/gallium/drivers/radeon/SISchedule.td | 15 +
.../drivers/radeon/TargetInfo/AMDILTargetInfo.cpp | 32 +
src/gallium/drivers/radeon/loader.cpp | 34 +
src/gallium/drivers/radeon/radeon_llvm.h | 136 +
src/gallium/drivers/radeon/radeon_llvm_emit.cpp | 145 +
.../drivers/radeon/radeon_setup_tgsi_llvm.c | 660 ++
src/gallium/drivers/radeonsi/Android.mk | 38 +
src/gallium/drivers/radeonsi/Makefile | 24 +
src/gallium/drivers/radeonsi/Makefile.sources | 13 +
src/gallium/drivers/radeonsi/SConscript | 17 +
.../drivers/radeonsi/evergreen_hw_context.c | 561 ++
src/gallium/drivers/radeonsi/evergreen_state.c | 2169 ++++++
src/gallium/drivers/radeonsi/r600.h | 245 +
src/gallium/drivers/radeonsi/r600_blit.c | 379 +
src/gallium/drivers/radeonsi/r600_buffer.c | 282 +
src/gallium/drivers/radeonsi/r600_hw_context.c | 1151 +++
.../drivers/radeonsi/r600_hw_context_priv.h | 76 +
src/gallium/drivers/radeonsi/r600_query.c | 130 +
src/gallium/drivers/radeonsi/r600_resource.c | 64 +
src/gallium/drivers/radeonsi/r600_resource.h | 105 +
src/gallium/drivers/radeonsi/r600_state_common.c | 899 +++
src/gallium/drivers/radeonsi/r600_texture.c | 825 +++
src/gallium/drivers/radeonsi/r600_translate.c | 54 +
src/gallium/drivers/radeonsi/radeonsi_pipe.c | 731 ++
src/gallium/drivers/radeonsi/radeonsi_pipe.h | 490 ++
src/gallium/drivers/radeonsi/radeonsi_public.h | 30 +
src/gallium/drivers/radeonsi/radeonsi_shader.c | 565 ++
src/gallium/drivers/radeonsi/radeonsi_shader.h | 4 +
src/gallium/drivers/radeonsi/sid.h | 7668 ++++++++++++++++++++
src/gallium/targets/dri-radeonsi/Makefile | 26 +
src/gallium/targets/dri-radeonsi/SConscript | 25 +
src/gallium/targets/dri-radeonsi/target.c | 40 +
src/gallium/targets/egl-static/Android.mk | 3 +
src/gallium/targets/egl-static/Makefile | 11 +
src/gallium/targets/egl-static/SConscript | 3 +-
src/gallium/targets/egl-static/egl_pipe.c | 27 +
src/gallium/targets/gbm/Makefile | 13 +
src/gallium/targets/gbm/pipe_radeonsi.c | 26 +
src/gallium/targets/xorg-radeonsi/Makefile | 24 +
src/gallium/targets/xorg-radeonsi/target.c | 26 +
src/gallium/targets/xorg-radeonsi/xorg.c | 148 +
src/gallium/winsys/radeon/drm/radeon_drm_winsys.c | 8 +-
src/gallium/winsys/radeon/drm/radeon_drm_winsys.h | 3 +-
200 files changed, 66076 insertions(+), 10 deletions(-)
Diff: http://cgit.freedesktop.org/mesa/mesa/diff/?id=a75c6163e605f35b14f26930dd9227e4f337ec9e
More information about the mesa-commit
mailing list