radv: move calculating primgroup_size to pipeline.
[mesa.git] / src / amd / vulkan / si_cmd_buffer.c
index e7ad4e0e87ea38092b529492936d49fa63b83941..9abd05583c52be978915355516e865175b1cbc76 100644 (file)
 /* command buffer handling for SI */
 
 #include "radv_private.h"
+#include "radv_shader.h"
 #include "radv_cs.h"
 #include "sid.h"
+#include "gfx9d.h"
 #include "radv_util.h"
 #include "main/macros.h"
 
@@ -241,6 +243,9 @@ si_emit_config(struct radv_physical_device *physical_device,
        radeon_set_context_reg(cs, R_028B28_VGT_STRMOUT_DRAW_OPAQUE_OFFSET, 0);
 
        radeon_set_context_reg(cs, R_028B98_VGT_STRMOUT_BUFFER_CONFIG, 0x0);
+       radeon_set_context_reg(cs, R_028AA0_VGT_INSTANCE_STEP_RATE_0, 1);
+       if (physical_device->rad_info.chip_class >= GFX9)
+               radeon_set_context_reg(cs, R_028AB4_VGT_REUSE_OFF, 0);
        radeon_set_context_reg(cs, R_028AB8_VGT_VTX_CNT_EN, 0x0);
        if (physical_device->rad_info.chip_class < CIK)
                radeon_set_config_reg(cs, R_008A14_PA_CL_ENHANCE, S_008A14_NUM_CLIP_SEQ(3) |
@@ -328,24 +333,28 @@ si_emit_config(struct radv_physical_device *physical_device,
                raster_config_1 = 0x00000000;
                break;
        default:
-               fprintf(stderr,
-                       "radeonsi: Unknown GPU, using 0 for raster_config\n");
-               raster_config = 0x00000000;
-               raster_config_1 = 0x00000000;
+               if (physical_device->rad_info.chip_class <= VI) {
+                       fprintf(stderr,
+                               "radeonsi: Unknown GPU, using 0 for raster_config\n");
+                       raster_config = 0x00000000;
+                       raster_config_1 = 0x00000000;
+               }
                break;
        }
 
        /* Always use the default config when all backends are enabled
         * (or when we failed to determine the enabled backends).
         */
-       if (!rb_mask || util_bitcount(rb_mask) >= num_rb) {
-               radeon_set_context_reg(cs, R_028350_PA_SC_RASTER_CONFIG,
-                                      raster_config);
-               if (physical_device->rad_info.chip_class >= CIK)
-                       radeon_set_context_reg(cs, R_028354_PA_SC_RASTER_CONFIG_1,
-                                              raster_config_1);
-       } else {
-               si_write_harvested_raster_configs(physical_device, cs, raster_config, raster_config_1);
+       if (physical_device->rad_info.chip_class <= VI) {
+               if (!rb_mask || util_bitcount(rb_mask) >= num_rb) {
+                       radeon_set_context_reg(cs, R_028350_PA_SC_RASTER_CONFIG,
+                                              raster_config);
+                       if (physical_device->rad_info.chip_class >= CIK)
+                               radeon_set_context_reg(cs, R_028354_PA_SC_RASTER_CONFIG_1,
+                                                      raster_config_1);
+               } else {
+                       si_write_harvested_raster_configs(physical_device, cs, raster_config, raster_config_1);
+               }
        }
 
        radeon_set_context_reg(cs, R_028204_PA_SC_WINDOW_SCISSOR_TL, S_028204_WINDOW_OFFSET_DISABLE(1));
@@ -369,22 +378,31 @@ si_emit_config(struct radv_physical_device *physical_device,
                               S_02800C_FORCE_HIS_ENABLE0(V_02800C_FORCE_DISABLE) |
                               S_02800C_FORCE_HIS_ENABLE1(V_02800C_FORCE_DISABLE));
 
-       radeon_set_context_reg(cs, R_028400_VGT_MAX_VTX_INDX, ~0);
-       radeon_set_context_reg(cs, R_028404_VGT_MIN_VTX_INDX, 0);
-       radeon_set_context_reg(cs, R_028408_VGT_INDX_OFFSET, 0);
+       if (physical_device->rad_info.chip_class >= GFX9) {
+               radeon_set_uconfig_reg(cs, R_030920_VGT_MAX_VTX_INDX, ~0);
+               radeon_set_uconfig_reg(cs, R_030924_VGT_MIN_VTX_INDX, 0);
+               radeon_set_uconfig_reg(cs, R_030928_VGT_INDX_OFFSET, 0);
+       } else {
+               radeon_set_context_reg(cs, R_028400_VGT_MAX_VTX_INDX, ~0);
+               radeon_set_context_reg(cs, R_028404_VGT_MIN_VTX_INDX, 0);
+               radeon_set_context_reg(cs, R_028408_VGT_INDX_OFFSET, 0);
+       }
 
        if (physical_device->rad_info.chip_class >= CIK) {
-               /* If this is 0, Bonaire can hang even if GS isn't being used.
-                * Other chips are unaffected. These are suboptimal values,
-                * but we don't use on-chip GS.
-                */
-               radeon_set_context_reg(cs, R_028A44_VGT_GS_ONCHIP_CNTL,
-                                      S_028A44_ES_VERTS_PER_SUBGRP(64) |
-                                      S_028A44_GS_PRIMS_PER_SUBGRP(4));
-
-               radeon_set_sh_reg(cs, R_00B51C_SPI_SHADER_PGM_RSRC3_LS, S_00B51C_CU_EN(0xffff));
-               radeon_set_sh_reg(cs, R_00B41C_SPI_SHADER_PGM_RSRC3_HS, 0);
-               radeon_set_sh_reg(cs, R_00B31C_SPI_SHADER_PGM_RSRC3_ES, S_00B31C_CU_EN(0xffff));
+               if (physical_device->rad_info.chip_class >= GFX9) {
+                       radeon_set_sh_reg(cs, R_00B41C_SPI_SHADER_PGM_RSRC3_HS, S_00B41C_CU_EN(0xffff));
+               } else {
+                       radeon_set_sh_reg(cs, R_00B51C_SPI_SHADER_PGM_RSRC3_LS, S_00B51C_CU_EN(0xffff));
+                       radeon_set_sh_reg(cs, R_00B41C_SPI_SHADER_PGM_RSRC3_HS, 0);
+                       radeon_set_sh_reg(cs, R_00B31C_SPI_SHADER_PGM_RSRC3_ES, S_00B31C_CU_EN(0xffff));
+                       /* If this is 0, Bonaire can hang even if GS isn't being used.
+                        * Other chips are unaffected. These are suboptimal values,
+                        * but we don't use on-chip GS.
+                        */
+                       radeon_set_context_reg(cs, R_028A44_VGT_GS_ONCHIP_CNTL,
+                                              S_028A44_ES_VERTS_PER_SUBGRP(64) |
+                                              S_028A44_GS_PRIMS_PER_SUBGRP(4));
+               }
                radeon_set_sh_reg(cs, R_00B21C_SPI_SHADER_PGM_RSRC3_GS, S_00B21C_CU_EN(0xffff));
 
                if (physical_device->rad_info.num_good_compute_units /
@@ -435,9 +453,41 @@ si_emit_config(struct radv_physical_device *physical_device,
                radeon_set_context_reg(cs, R_028C5C_VGT_OUT_DEALLOC_CNTL, 16);
        }
 
-       if (physical_device->rad_info.family == CHIP_STONEY)
+       if (physical_device->has_rbplus)
                radeon_set_context_reg(cs, R_028C40_PA_SC_SHADER_CONTROL, 0);
 
+       if (physical_device->rad_info.chip_class >= GFX9) {
+               unsigned num_se = physical_device->rad_info.max_se;
+               unsigned pc_lines = 0;
+
+               switch (physical_device->rad_info.family) {
+               case CHIP_VEGA10:
+                       pc_lines = 4096;
+                       break;
+               case CHIP_RAVEN:
+                       pc_lines = 1024;
+                       break;
+               default:
+                       assert(0);
+               }
+
+               radeon_set_context_reg(cs, R_028060_DB_DFSM_CONTROL,
+                                      S_028060_PUNCHOUT_MODE(V_028060_FORCE_OFF));
+               radeon_set_context_reg(cs, R_028064_DB_RENDER_FILTER, 0);
+               /* TODO: We can use this to disable RBs for rendering to GART: */
+               radeon_set_context_reg(cs, R_02835C_PA_SC_TILE_STEERING_OVERRIDE, 0);
+               radeon_set_context_reg(cs, R_02883C_PA_SU_OVER_RASTERIZATION_CNTL, 0);
+               /* TODO: Enable the binner: */
+               radeon_set_context_reg(cs, R_028C44_PA_SC_BINNER_CNTL_0,
+                                      S_028C44_BINNING_MODE(V_028C44_DISABLE_BINNING_USE_LEGACY_SC) |
+                                      S_028C44_DISABLE_START_OF_PRIM(1));
+               radeon_set_context_reg(cs, R_028C48_PA_SC_BINNER_CNTL_1,
+                                      S_028C48_MAX_ALLOC_COUNT(MIN2(128, pc_lines / (4 * num_se))) |
+                                      S_028C48_MAX_PRIM_PER_BATCH(1023));
+               radeon_set_context_reg(cs, R_028C4C_PA_SC_CONSERVATIVE_RASTERIZATION_CNTL,
+                                      S_028C4C_NULL_SQUAD_AA_MASK_ENABLE(1));
+               radeon_set_uconfig_reg(cs, R_030968_VGT_INSTANCE_BASE_ID, 0);
+       }
        si_emit_compute(physical_device, cs);
 }
 
@@ -633,7 +683,6 @@ si_get_ia_multi_vgt_param(struct radv_cmd_buffer *cmd_buffer,
        enum radeon_family family = cmd_buffer->device->physical_device->rad_info.family;
        struct radeon_info *info = &cmd_buffer->device->physical_device->rad_info;
        unsigned prim = cmd_buffer->state.pipeline->graphics.prim;
-       unsigned primgroup_size = 128; /* recommended without a GS */
        unsigned max_primgroup_in_wave = 2;
        /* SWITCH_ON_EOP(0) is always preferable. */
        bool wd_switch_on_eop = false;
@@ -641,16 +690,18 @@ si_get_ia_multi_vgt_param(struct radv_cmd_buffer *cmd_buffer,
        bool ia_switch_on_eoi = false;
        bool partial_vs_wave = false;
        bool partial_es_wave = false;
-       uint32_t num_prims = radv_prims_for_vertices(&cmd_buffer->state.pipeline->graphics.prim_vertex_count, draw_vertex_count);
        bool multi_instances_smaller_than_primgroup;
 
-       if (radv_pipeline_has_tess(cmd_buffer->state.pipeline))
-               primgroup_size = cmd_buffer->state.pipeline->graphics.tess.num_patches;
-       else if (radv_pipeline_has_gs(cmd_buffer->state.pipeline))
-               primgroup_size = 64;  /* recommended with a GS */
+       multi_instances_smaller_than_primgroup = indirect_draw;
+       if (!multi_instances_smaller_than_primgroup && instanced_draw) {
+               uint32_t num_prims = radv_prims_for_vertices(&cmd_buffer->state.pipeline->graphics.prim_vertex_count, draw_vertex_count);
+               if (num_prims < cmd_buffer->state.pipeline->graphics.primgroup_size)
+                       multi_instances_smaller_than_primgroup = true;
+       }
+
+       if (cmd_buffer->state.pipeline->shaders[MESA_SHADER_FRAGMENT]->info.fs.prim_id_input)
+               ia_switch_on_eoi = true;
 
-       multi_instances_smaller_than_primgroup = indirect_draw || (instanced_draw &&
-                                                                  num_prims < primgroup_size);
        if (radv_pipeline_has_tess(cmd_buffer->state.pipeline)) {
                /* SWITCH_ON_EOI must be set if PrimID is used. */
                if (cmd_buffer->state.pipeline->shaders[MESA_SHADER_TESS_CTRL]->info.tcs.uses_prim_id ||
@@ -667,7 +718,8 @@ si_get_ia_multi_vgt_param(struct radv_cmd_buffer *cmd_buffer,
                /* Needed for 028B6C_DISTRIBUTION_MODE != 0 */
                if (cmd_buffer->device->has_distributed_tess) {
                        if (radv_pipeline_has_gs(cmd_buffer->state.pipeline)) {
-                               partial_es_wave = true;
+                               if (chip_class <= VI)
+                                       partial_es_wave = true;
 
                                if (family == CHIP_TONGA ||
                                    family == CHIP_FIJI ||
@@ -735,34 +787,51 @@ si_get_ia_multi_vgt_param(struct radv_cmd_buffer *cmd_buffer,
                assert(wd_switch_on_eop || !ia_switch_on_eop);
        }
        /* If SWITCH_ON_EOI is set, PARTIAL_ES_WAVE must be set too. */
-       if (ia_switch_on_eoi)
+       if (chip_class <= VI && ia_switch_on_eoi)
                partial_es_wave = true;
 
        if (radv_pipeline_has_gs(cmd_buffer->state.pipeline)) {
+
+               if (radv_pipeline_has_gs(cmd_buffer->state.pipeline) &&
+                   cmd_buffer->state.pipeline->shaders[MESA_SHADER_GEOMETRY]->info.gs.uses_prim_id)
+                       ia_switch_on_eoi = true;
+
                /* GS requirement. */
-               if (SI_GS_PER_ES / primgroup_size >= cmd_buffer->device->gs_table_depth - 3)
+               if (SI_GS_PER_ES / cmd_buffer->state.pipeline->graphics.primgroup_size >= cmd_buffer->device->gs_table_depth - 3)
                        partial_es_wave = true;
 
-               /* Hw bug with single-primitive instances and SWITCH_ON_EOI
-                * on multi-SE chips. */
-               if (info->max_se >= 2 && ia_switch_on_eoi &&
-                   ((instanced_draw || indirect_draw) &&
-                    num_prims <= 1))
-                       cmd_buffer->state.flush_bits |= RADV_CMD_FLAG_VGT_FLUSH;
+               /* GS hw bug with single-primitive instances and SWITCH_ON_EOI.
+                * The hw doc says all multi-SE chips are affected, but amdgpu-pro Vulkan
+                * only applies it to Hawaii. Do what amdgpu-pro Vulkan does.
+                */
+               if (family == CHIP_HAWAII && ia_switch_on_eoi) {
+                       bool set_vgt_flush = indirect_draw;
+                       if (!set_vgt_flush && instanced_draw) {
+                               uint32_t num_prims = radv_prims_for_vertices(&cmd_buffer->state.pipeline->graphics.prim_vertex_count, draw_vertex_count);
+                               if (num_prims <= 1)
+                                       set_vgt_flush = true;
+                       }
+                       if (set_vgt_flush)
+                               cmd_buffer->state.flush_bits |= RADV_CMD_FLAG_VGT_FLUSH;
+               }
        }
 
        return S_028AA8_SWITCH_ON_EOP(ia_switch_on_eop) |
                S_028AA8_SWITCH_ON_EOI(ia_switch_on_eoi) |
                S_028AA8_PARTIAL_VS_WAVE_ON(partial_vs_wave) |
                S_028AA8_PARTIAL_ES_WAVE_ON(partial_es_wave) |
-               S_028AA8_PRIMGROUP_SIZE(primgroup_size - 1) |
+               S_028AA8_PRIMGROUP_SIZE(cmd_buffer->state.pipeline->graphics.primgroup_size - 1) |
                S_028AA8_WD_SWITCH_ON_EOP(chip_class >= CIK ? wd_switch_on_eop : 0) |
-               S_028AA8_MAX_PRIMGRP_IN_WAVE(chip_class >= VI ?
-                                            max_primgroup_in_wave : 0);
+               /* The following field was moved to VGT_SHADER_STAGES_EN in GFX9. */
+               S_028AA8_MAX_PRIMGRP_IN_WAVE(chip_class == VI ?
+                                            max_primgroup_in_wave : 0) |
+               S_030960_EN_INST_OPT_BASIC(chip_class >= GFX9) |
+               S_030960_EN_INST_OPT_ADV(chip_class >= GFX9);
 
 }
 
 void si_cs_emit_write_event_eop(struct radeon_winsys_cs *cs,
+                               bool predicated,
                                enum chip_class chip_class,
                                bool is_mec,
                                unsigned event, unsigned event_flags,
@@ -774,15 +843,18 @@ void si_cs_emit_write_event_eop(struct radeon_winsys_cs *cs,
        unsigned op = EVENT_TYPE(event) |
                EVENT_INDEX(5) |
                event_flags;
+       unsigned is_gfx8_mec = is_mec && chip_class < GFX9;
 
-       if (is_mec) {
-               radeon_emit(cs, PKT3(PKT3_RELEASE_MEM, 5, 0));
+       if (chip_class >= GFX9 || is_gfx8_mec) {
+               radeon_emit(cs, PKT3(PKT3_RELEASE_MEM, is_gfx8_mec ? 5 : 6, predicated));
                radeon_emit(cs, op);
                radeon_emit(cs, EOP_DATA_SEL(data_sel));
                radeon_emit(cs, va);            /* address lo */
                radeon_emit(cs, va >> 32);      /* address hi */
                radeon_emit(cs, new_fence);     /* immediate data lo */
                radeon_emit(cs, 0); /* immediate data hi */
+               if (!is_gfx8_mec)
+                       radeon_emit(cs, 0); /* unused */
        } else {
                if (chip_class == CIK ||
                    chip_class == VI) {
@@ -790,7 +862,7 @@ void si_cs_emit_write_event_eop(struct radeon_winsys_cs *cs,
                         * (and optional cache flushes executed) before the timestamp
                         * is written.
                         */
-                       radeon_emit(cs, PKT3(PKT3_EVENT_WRITE_EOP, 4, 0));
+                       radeon_emit(cs, PKT3(PKT3_EVENT_WRITE_EOP, 4, predicated));
                        radeon_emit(cs, op);
                        radeon_emit(cs, va);
                        radeon_emit(cs, ((va >> 32) & 0xffff) | EOP_DATA_SEL(data_sel));
@@ -798,7 +870,7 @@ void si_cs_emit_write_event_eop(struct radeon_winsys_cs *cs,
                        radeon_emit(cs, 0); /* unused */
                }
 
-               radeon_emit(cs, PKT3(PKT3_EVENT_WRITE_EOP, 4, 0));
+               radeon_emit(cs, PKT3(PKT3_EVENT_WRITE_EOP, 4, predicated));
                radeon_emit(cs, op);
                radeon_emit(cs, va);
                radeon_emit(cs, ((va >> 32) & 0xffff) | EOP_DATA_SEL(data_sel));
@@ -809,10 +881,11 @@ void si_cs_emit_write_event_eop(struct radeon_winsys_cs *cs,
 
 void
 si_emit_wait_fence(struct radeon_winsys_cs *cs,
+                  bool predicated,
                   uint64_t va, uint32_t ref,
                   uint32_t mask)
 {
-       radeon_emit(cs, PKT3(PKT3_WAIT_REG_MEM, 5, 0));
+       radeon_emit(cs, PKT3(PKT3_WAIT_REG_MEM, 5, predicated));
        radeon_emit(cs, WAIT_REG_MEM_EQUAL | WAIT_REG_MEM_MEM_SPACE(1));
        radeon_emit(cs, va);
        radeon_emit(cs, va >> 32);
@@ -824,20 +897,23 @@ si_emit_wait_fence(struct radeon_winsys_cs *cs,
 static void
 si_emit_acquire_mem(struct radeon_winsys_cs *cs,
                     bool is_mec,
+                   bool predicated,
+                   bool is_gfx9,
                     unsigned cp_coher_cntl)
 {
-       if (is_mec) {
-               radeon_emit(cs, PKT3(PKT3_ACQUIRE_MEM, 5, 0) |
-                                           PKT3_SHADER_TYPE_S(1));
+       if (is_mec || is_gfx9) {
+               uint32_t hi_val = is_gfx9 ? 0xffffff : 0xff;
+               radeon_emit(cs, PKT3(PKT3_ACQUIRE_MEM, 5, predicated) |
+                                           PKT3_SHADER_TYPE_S(is_mec));
                radeon_emit(cs, cp_coher_cntl);   /* CP_COHER_CNTL */
                radeon_emit(cs, 0xffffffff);      /* CP_COHER_SIZE */
-               radeon_emit(cs, 0xff);            /* CP_COHER_SIZE_HI */
+               radeon_emit(cs, hi_val);          /* CP_COHER_SIZE_HI */
                radeon_emit(cs, 0);               /* CP_COHER_BASE */
                radeon_emit(cs, 0);               /* CP_COHER_BASE_HI */
                radeon_emit(cs, 0x0000000A);      /* POLL_INTERVAL */
        } else {
                /* ACQUIRE_MEM is only required on a compute ring. */
-               radeon_emit(cs, PKT3(PKT3_SURFACE_SYNC, 3, 0));
+               radeon_emit(cs, PKT3(PKT3_SURFACE_SYNC, 3, predicated));
                radeon_emit(cs, cp_coher_cntl);   /* CP_COHER_CNTL */
                radeon_emit(cs, 0xffffffff);      /* CP_COHER_SIZE */
                radeon_emit(cs, 0);               /* CP_COHER_BASE */
@@ -847,107 +923,179 @@ si_emit_acquire_mem(struct radeon_winsys_cs *cs,
 
 void
 si_cs_emit_cache_flush(struct radeon_winsys_cs *cs,
+                      bool predicated,
                        enum chip_class chip_class,
+                      uint32_t *flush_cnt,
+                      uint64_t flush_va,
                        bool is_mec,
                        enum radv_cmd_flush_bits flush_bits)
 {
        unsigned cp_coher_cntl = 0;
-
+       uint32_t flush_cb_db = flush_bits & (RADV_CMD_FLAG_FLUSH_AND_INV_CB |
+                                            RADV_CMD_FLAG_FLUSH_AND_INV_DB);
+       
        if (flush_bits & RADV_CMD_FLAG_INV_ICACHE)
                cp_coher_cntl |= S_0085F0_SH_ICACHE_ACTION_ENA(1);
        if (flush_bits & RADV_CMD_FLAG_INV_SMEM_L1)
                cp_coher_cntl |= S_0085F0_SH_KCACHE_ACTION_ENA(1);
 
-       if (flush_bits & RADV_CMD_FLAG_FLUSH_AND_INV_CB) {
-               cp_coher_cntl |= S_0085F0_CB_ACTION_ENA(1) |
-                       S_0085F0_CB0_DEST_BASE_ENA(1) |
-                       S_0085F0_CB1_DEST_BASE_ENA(1) |
-                       S_0085F0_CB2_DEST_BASE_ENA(1) |
-                       S_0085F0_CB3_DEST_BASE_ENA(1) |
-                       S_0085F0_CB4_DEST_BASE_ENA(1) |
-                       S_0085F0_CB5_DEST_BASE_ENA(1) |
-                       S_0085F0_CB6_DEST_BASE_ENA(1) |
-                       S_0085F0_CB7_DEST_BASE_ENA(1);
-
-               /* Necessary for DCC */
-               if (chip_class >= VI) {
-                       si_cs_emit_write_event_eop(cs,
-                                                  chip_class,
-                                                  is_mec,
-                                                  V_028A90_FLUSH_AND_INV_CB_DATA_TS,
-                                                  0, 0, 0, 0, 0);
+       if (chip_class <= VI) {
+               if (flush_bits & RADV_CMD_FLAG_FLUSH_AND_INV_CB) {
+                       cp_coher_cntl |= S_0085F0_CB_ACTION_ENA(1) |
+                               S_0085F0_CB0_DEST_BASE_ENA(1) |
+                               S_0085F0_CB1_DEST_BASE_ENA(1) |
+                               S_0085F0_CB2_DEST_BASE_ENA(1) |
+                               S_0085F0_CB3_DEST_BASE_ENA(1) |
+                               S_0085F0_CB4_DEST_BASE_ENA(1) |
+                               S_0085F0_CB5_DEST_BASE_ENA(1) |
+                               S_0085F0_CB6_DEST_BASE_ENA(1) |
+                               S_0085F0_CB7_DEST_BASE_ENA(1);
+
+                       /* Necessary for DCC */
+                       if (chip_class >= VI) {
+                               si_cs_emit_write_event_eop(cs,
+                                                          predicated,
+                                                          chip_class,
+                                                          is_mec,
+                                                          V_028A90_FLUSH_AND_INV_CB_DATA_TS,
+                                                          0, 0, 0, 0, 0);
+                       }
+               }
+               if (flush_bits & RADV_CMD_FLAG_FLUSH_AND_INV_DB) {
+                       cp_coher_cntl |= S_0085F0_DB_ACTION_ENA(1) |
+                               S_0085F0_DB_DEST_BASE_ENA(1);
                }
-       }
-
-       if (flush_bits & RADV_CMD_FLAG_FLUSH_AND_INV_DB) {
-               cp_coher_cntl |= S_0085F0_DB_ACTION_ENA(1) |
-                       S_0085F0_DB_DEST_BASE_ENA(1);
        }
 
        if (flush_bits & RADV_CMD_FLAG_FLUSH_AND_INV_CB_META) {
-               radeon_emit(cs, PKT3(PKT3_EVENT_WRITE, 0, 0));
+               radeon_emit(cs, PKT3(PKT3_EVENT_WRITE, 0, predicated));
                radeon_emit(cs, EVENT_TYPE(V_028A90_FLUSH_AND_INV_CB_META) | EVENT_INDEX(0));
        }
 
        if (flush_bits & RADV_CMD_FLAG_FLUSH_AND_INV_DB_META) {
-               radeon_emit(cs, PKT3(PKT3_EVENT_WRITE, 0, 0));
+               radeon_emit(cs, PKT3(PKT3_EVENT_WRITE, 0, predicated));
                radeon_emit(cs, EVENT_TYPE(V_028A90_FLUSH_AND_INV_DB_META) | EVENT_INDEX(0));
        }
 
-       if (!(flush_bits & (RADV_CMD_FLAG_FLUSH_AND_INV_CB |
-                                             RADV_CMD_FLAG_FLUSH_AND_INV_DB))) {
+       if (!flush_cb_db) {
                if (flush_bits & RADV_CMD_FLAG_PS_PARTIAL_FLUSH) {
-                       radeon_emit(cs, PKT3(PKT3_EVENT_WRITE, 0, 0));
+                       radeon_emit(cs, PKT3(PKT3_EVENT_WRITE, 0, predicated));
                        radeon_emit(cs, EVENT_TYPE(V_028A90_PS_PARTIAL_FLUSH) | EVENT_INDEX(4));
                } else if (flush_bits & RADV_CMD_FLAG_VS_PARTIAL_FLUSH) {
-                       radeon_emit(cs, PKT3(PKT3_EVENT_WRITE, 0, 0));
+                       radeon_emit(cs, PKT3(PKT3_EVENT_WRITE, 0, predicated));
                        radeon_emit(cs, EVENT_TYPE(V_028A90_VS_PARTIAL_FLUSH) | EVENT_INDEX(4));
                }
        }
 
        if (flush_bits & RADV_CMD_FLAG_CS_PARTIAL_FLUSH) {
-               radeon_emit(cs, PKT3(PKT3_EVENT_WRITE, 0, 0));
+               radeon_emit(cs, PKT3(PKT3_EVENT_WRITE, 0, predicated));
                radeon_emit(cs, EVENT_TYPE(V_028A90_CS_PARTIAL_FLUSH) | EVENT_INDEX(4));
        }
 
+       if (chip_class >= GFX9 && flush_cb_db) {
+               unsigned cb_db_event, tc_flags;
+
+               /* Set the CB/DB flush event. */
+               switch (flush_cb_db) {
+               case RADV_CMD_FLAG_FLUSH_AND_INV_CB:
+                       cb_db_event = V_028A90_FLUSH_AND_INV_CB_DATA_TS;
+                       break;
+               case RADV_CMD_FLAG_FLUSH_AND_INV_DB:
+                       cb_db_event = V_028A90_FLUSH_AND_INV_DB_DATA_TS;
+                       break;
+               default:
+                       /* both CB & DB */
+                       cb_db_event = V_028A90_CACHE_FLUSH_AND_INV_TS_EVENT;
+               }
+
+               /* TC    | TC_WB         = invalidate L2 data
+                * TC_MD | TC_WB         = invalidate L2 metadata
+                * TC    | TC_WB | TC_MD = invalidate L2 data & metadata
+                *
+                * The metadata cache must always be invalidated for coherency
+                * between CB/DB and shaders. (metadata = HTILE, CMASK, DCC)
+                *
+                * TC must be invalidated on GFX9 only if the CB/DB surface is
+                * not pipe-aligned. If the surface is RB-aligned, it might not
+                * strictly be pipe-aligned since RB alignment takes precendence.
+                */
+               tc_flags = EVENT_TC_WB_ACTION_ENA |
+                          EVENT_TC_MD_ACTION_ENA;
+
+               /* Ideally flush TC together with CB/DB. */
+               if (flush_bits & RADV_CMD_FLAG_INV_GLOBAL_L2) {
+                       tc_flags |= EVENT_TC_ACTION_ENA |
+                                   EVENT_TCL1_ACTION_ENA;
+
+                       /* Clear the flags. */
+                       flush_bits &= ~(RADV_CMD_FLAG_INV_GLOBAL_L2 |
+                                        RADV_CMD_FLAG_WRITEBACK_GLOBAL_L2 |
+                                        RADV_CMD_FLAG_INV_VMEM_L1);
+               }
+               assert(flush_cnt);
+               uint32_t old_fence = (*flush_cnt)++;
+
+               si_cs_emit_write_event_eop(cs, predicated, chip_class, false, cb_db_event, tc_flags, 1,
+                                          flush_va, old_fence, *flush_cnt);
+               si_emit_wait_fence(cs, predicated, flush_va, *flush_cnt, 0xffffffff);
+       }
+
        /* VGT state sync */
        if (flush_bits & RADV_CMD_FLAG_VGT_FLUSH) {
-               radeon_emit(cs, PKT3(PKT3_EVENT_WRITE, 0, 0));
+               radeon_emit(cs, PKT3(PKT3_EVENT_WRITE, 0, predicated));
                radeon_emit(cs, EVENT_TYPE(V_028A90_VGT_FLUSH) | EVENT_INDEX(0));
        }
 
        /* Make sure ME is idle (it executes most packets) before continuing.
         * This prevents read-after-write hazards between PFP and ME.
         */
-       if ((cp_coher_cntl || (flush_bits & RADV_CMD_FLAG_CS_PARTIAL_FLUSH)) &&
+       if ((cp_coher_cntl ||
+            (flush_bits & (RADV_CMD_FLAG_CS_PARTIAL_FLUSH |
+                           RADV_CMD_FLAG_INV_VMEM_L1 |
+                           RADV_CMD_FLAG_INV_GLOBAL_L2 |
+                           RADV_CMD_FLAG_WRITEBACK_GLOBAL_L2))) &&
            !is_mec) {
-               radeon_emit(cs, PKT3(PKT3_PFP_SYNC_ME, 0, 0));
+               radeon_emit(cs, PKT3(PKT3_PFP_SYNC_ME, 0, predicated));
                radeon_emit(cs, 0);
        }
 
        if ((flush_bits & RADV_CMD_FLAG_INV_GLOBAL_L2) ||
            (chip_class <= CIK && (flush_bits & RADV_CMD_FLAG_WRITEBACK_GLOBAL_L2))) {
-               cp_coher_cntl |= S_0085F0_TC_ACTION_ENA(1);
-               if (chip_class >= VI)
-                       cp_coher_cntl |= S_0301F0_TC_WB_ACTION_ENA(1);
-       } else  if(flush_bits & RADV_CMD_FLAG_WRITEBACK_GLOBAL_L2) {
-               cp_coher_cntl |= S_0301F0_TC_WB_ACTION_ENA(1) |
-                                S_0301F0_TC_NC_ACTION_ENA(1);
-
-               /* L2 writeback doesn't combine with L1 invalidate */
-               si_emit_acquire_mem(cs, is_mec, cp_coher_cntl);
-
+               si_emit_acquire_mem(cs, is_mec, predicated, chip_class >= GFX9,
+                                   cp_coher_cntl |
+                                   S_0085F0_TC_ACTION_ENA(1) |
+                                   S_0085F0_TCL1_ACTION_ENA(1) |
+                                   S_0301F0_TC_WB_ACTION_ENA(chip_class >= VI));
                cp_coher_cntl = 0;
+       } else {
+               if(flush_bits & RADV_CMD_FLAG_WRITEBACK_GLOBAL_L2) {
+                       /* WB = write-back
+                        * NC = apply to non-coherent MTYPEs
+                        *      (i.e. MTYPE <= 1, which is what we use everywhere)
+                        *
+                        * WB doesn't work without NC.
+                        */
+                       si_emit_acquire_mem(cs, is_mec, predicated,
+                                           chip_class >= GFX9,
+                                           cp_coher_cntl |
+                                           S_0301F0_TC_WB_ACTION_ENA(1) |
+                                           S_0301F0_TC_NC_ACTION_ENA(1));
+                       cp_coher_cntl = 0;
+               }
+               if (flush_bits & RADV_CMD_FLAG_INV_VMEM_L1) {
+                       si_emit_acquire_mem(cs, is_mec,
+                                           predicated, chip_class >= GFX9,
+                                           cp_coher_cntl |
+                                           S_0085F0_TCL1_ACTION_ENA(1));
+                       cp_coher_cntl = 0;
+               }
        }
 
-       if (flush_bits & RADV_CMD_FLAG_INV_VMEM_L1)
-               cp_coher_cntl |= S_0085F0_TCL1_ACTION_ENA(1);
-
        /* When one of the DEST_BASE flags is set, SURFACE_SYNC waits for idle.
         * Therefore, it should be last. Done in PFP.
         */
        if (cp_coher_cntl)
-               si_emit_acquire_mem(cs, is_mec, cp_coher_cntl);
+               si_emit_acquire_mem(cs, is_mec, predicated, chip_class >= GFX9, cp_coher_cntl);
 }
 
 void
@@ -964,19 +1112,49 @@ si_emit_cache_flush(struct radv_cmd_buffer *cmd_buffer)
                                                  RADV_CMD_FLAG_VS_PARTIAL_FLUSH |
                                                  RADV_CMD_FLAG_VGT_FLUSH);
 
+       if (!cmd_buffer->state.flush_bits)
+               return;
+
+       enum chip_class chip_class = cmd_buffer->device->physical_device->rad_info.chip_class;
        radeon_check_space(cmd_buffer->device->ws, cmd_buffer->cs, 128);
 
+       uint32_t *ptr = NULL;
+       uint64_t va = 0;
+       if (chip_class == GFX9) {
+               va = cmd_buffer->device->ws->buffer_get_va(cmd_buffer->gfx9_fence_bo) + cmd_buffer->gfx9_fence_offset;
+               ptr = &cmd_buffer->gfx9_fence_idx;
+       }
        si_cs_emit_cache_flush(cmd_buffer->cs,
+                              cmd_buffer->state.predicating,
                               cmd_buffer->device->physical_device->rad_info.chip_class,
+                              ptr, va,
                               radv_cmd_buffer_uses_mec(cmd_buffer),
                               cmd_buffer->state.flush_bits);
 
 
-       if (cmd_buffer->state.flush_bits)
-               radv_cmd_buffer_trace_emit(cmd_buffer);
+       radv_cmd_buffer_trace_emit(cmd_buffer);
        cmd_buffer->state.flush_bits = 0;
 }
 
+/* sets the CP predication state using a boolean stored at va */
+void
+si_emit_set_predication_state(struct radv_cmd_buffer *cmd_buffer, uint64_t va)
+{
+       uint32_t op = 0;
+
+       if (va)
+               op = PRED_OP(PREDICATION_OP_BOOL64) | PREDICATION_DRAW_VISIBLE;
+       if (cmd_buffer->device->physical_device->rad_info.chip_class >= GFX9) {
+               radeon_emit(cmd_buffer->cs, PKT3(PKT3_SET_PREDICATION, 2, 0));
+               radeon_emit(cmd_buffer->cs, op);
+               radeon_emit(cmd_buffer->cs, va);
+               radeon_emit(cmd_buffer->cs, va >> 32);
+       } else {
+               radeon_emit(cmd_buffer->cs, PKT3(PKT3_SET_PREDICATION, 1, 0));
+               radeon_emit(cmd_buffer->cs, va);
+               radeon_emit(cmd_buffer->cs, op | ((va >> 32) & 0xFF));
+       }
+}
 
 /* Set this if you want the 3D engine to wait until CP DMA is done.
  * It should be set on the last CP DMA packet. */
@@ -995,7 +1173,9 @@ si_emit_cache_flush(struct radv_cmd_buffer *cmd_buffer)
 /* The max number of bytes that can be copied per packet. */
 static inline unsigned cp_dma_max_byte_count(struct radv_cmd_buffer *cmd_buffer)
 {
-       unsigned max = S_414_BYTE_COUNT_GFX6(~0u);
+       unsigned max = cmd_buffer->device->physical_device->rad_info.chip_class >= GFX9 ?
+                              S_414_BYTE_COUNT_GFX9(~0u) :
+                              S_414_BYTE_COUNT_GFX6(~0u);
 
        /* make it aligned for optimal performance */
        return max & ~(SI_CPDMA_ALIGNMENT - 1);
@@ -1016,21 +1196,30 @@ static void si_emit_cp_dma(struct radv_cmd_buffer *cmd_buffer,
        assert(size <= cp_dma_max_byte_count(cmd_buffer));
 
        radeon_check_space(cmd_buffer->device->ws, cmd_buffer->cs, 9);
-
-       command |= S_414_BYTE_COUNT_GFX6(size);
+       if (cmd_buffer->device->physical_device->rad_info.chip_class >= GFX9)
+               command |= S_414_BYTE_COUNT_GFX9(size);
+       else
+               command |= S_414_BYTE_COUNT_GFX6(size);
 
        /* Sync flags. */
        if (flags & CP_DMA_SYNC)
                header |= S_411_CP_SYNC(1);
        else {
-               command |= S_414_DISABLE_WR_CONFIRM_GFX6(1);
+               if (cmd_buffer->device->physical_device->rad_info.chip_class >= GFX9)
+                       command |= S_414_DISABLE_WR_CONFIRM_GFX9(1);
+               else
+                       command |= S_414_DISABLE_WR_CONFIRM_GFX6(1);
        }
 
        if (flags & CP_DMA_RAW_WAIT)
                command |= S_414_RAW_WAIT(1);
 
        /* Src and dst flags. */
-       if (flags & CP_DMA_USE_L2)
+       if (cmd_buffer->device->physical_device->rad_info.chip_class >= GFX9 &&
+           !(flags & CP_DMA_CLEAR) &&
+           src_va == dst_va)
+               header |= S_411_DSL_SEL(V_411_NOWHERE); /* prefetch only */
+       else if (flags & CP_DMA_USE_L2)
                header |= S_411_DSL_SEL(V_411_DST_ADDR_TC_L2);
 
        if (flags & CP_DMA_CLEAR)
@@ -1039,7 +1228,7 @@ static void si_emit_cp_dma(struct radv_cmd_buffer *cmd_buffer,
                header |= S_411_SRC_SEL(V_411_SRC_ADDR_TC_L2);
 
        if (cmd_buffer->device->physical_device->rad_info.chip_class >= CIK) {
-               radeon_emit(cs, PKT3(PKT3_DMA_DATA, 5, 0));
+               radeon_emit(cs, PKT3(PKT3_DMA_DATA, 5, cmd_buffer->state.predicating));
                radeon_emit(cs, header);
                radeon_emit(cs, src_va);                /* SRC_ADDR_LO [31:0] */
                radeon_emit(cs, src_va >> 32);          /* SRC_ADDR_HI [31:0] */
@@ -1047,8 +1236,9 @@ static void si_emit_cp_dma(struct radv_cmd_buffer *cmd_buffer,
                radeon_emit(cs, dst_va >> 32);          /* DST_ADDR_HI [31:0] */
                radeon_emit(cs, command);
        } else {
+               assert(!(flags & CP_DMA_USE_L2));
                header |= S_411_SRC_ADDR_HI(src_va >> 32);
-               radeon_emit(cs, PKT3(PKT3_CP_DMA, 4, 0));
+               radeon_emit(cs, PKT3(PKT3_CP_DMA, 4, cmd_buffer->state.predicating));
                radeon_emit(cs, src_va);                        /* SRC_ADDR_LO [31:0] */
                radeon_emit(cs, header);                        /* SRC_ADDR_HI [15:0] + flags. */
                radeon_emit(cs, dst_va);                        /* DST_ADDR_LO [31:0] */
@@ -1062,7 +1252,7 @@ static void si_emit_cp_dma(struct radv_cmd_buffer *cmd_buffer,
         * should precede it.
         */
        if ((flags & CP_DMA_SYNC) && cmd_buffer->queue_family_index == RADV_QUEUE_GENERAL) {
-               radeon_emit(cs, PKT3(PKT3_PFP_SYNC_ME, 0, 0));
+               radeon_emit(cs, PKT3(PKT3_PFP_SYNC_ME, 0, cmd_buffer->state.predicating));
                radeon_emit(cs, 0);
        }