#include <brw_bufmgr.h>
-#include "common/gen_debug.h"
+#include "dev/gen_debug.h"
#include "common/gen_decoder.h"
#include "intel_screen.h"
#include "intel_tex_obj.h"
+#include "perf/gen_perf.h"
#ifdef __cplusplus
extern "C" {
BRW_MAX_CACHE
};
+enum gen9_astc5x5_wa_tex_type {
+ GEN9_ASTC5X5_WA_TEX_TYPE_ASTC5x5 = 1 << 0,
+ GEN9_ASTC5X5_WA_TEX_TYPE_AUX = 1 << 1,
+};
+
enum brw_state_id {
/* brw_cache_ids must come first - see brw_program_cache.c */
BRW_STATE_URB_FENCE = BRW_MAX_CACHE,
if (unlikely(INTEL_DEBUG & DEBUG_PERF)) \
dbg_printf(__VA_ARGS__); \
if (brw->perf_debug) \
- _mesa_gl_debug(&brw->ctx, &msg_id, \
- MESA_DEBUG_SOURCE_API, \
- MESA_DEBUG_TYPE_PERFORMANCE, \
- MESA_DEBUG_SEVERITY_MEDIUM, \
- __VA_ARGS__); \
+ _mesa_gl_debugf(&brw->ctx, &msg_id, \
+ MESA_DEBUG_SOURCE_API, \
+ MESA_DEBUG_TYPE_PERFORMANCE, \
+ MESA_DEBUG_SEVERITY_MEDIUM, \
+ __VA_ARGS__); \
} while(0)
#define WARN_ONCE(cond, fmt...) do { \
fprintf(stderr, fmt); \
_warned = true; \
\
- _mesa_gl_debug(ctx, &msg_id, \
- MESA_DEBUG_SOURCE_API, \
- MESA_DEBUG_TYPE_OTHER, \
- MESA_DEBUG_SEVERITY_HIGH, fmt); \
+ _mesa_gl_debugf(ctx, &msg_id, \
+ MESA_DEBUG_SOURCE_API, \
+ MESA_DEBUG_TYPE_OTHER, \
+ MESA_DEBUG_SEVERITY_HIGH, fmt); \
} \
} \
} while (0)
int exec_array_size;
/** The amount of aperture space (in bytes) used by all exec_bos */
- int aperture_space;
+ uint64_t aperture_space;
struct {
uint32_t *map_next;
} saved;
/** Map from batch offset to brw_state_batch data (with DEBUG_BATCH) */
- struct hash_table *state_batch_sizes;
+ struct hash_table_u64 *state_batch_sizes;
struct gen_batch_decode_ctx decoder;
};
struct shader_times;
struct gen_l3_config;
-
-enum brw_query_kind {
- OA_COUNTERS,
- OA_COUNTERS_RAW,
- PIPELINE_STATS,
-};
-
-struct brw_perf_query_register_prog {
- uint32_t reg;
- uint32_t val;
-};
-
-struct brw_perf_query_info
-{
- enum brw_query_kind kind;
- const char *name;
- const char *guid;
- struct brw_perf_query_counter *counters;
- int n_counters;
- size_t data_size;
-
- /* OA specific */
- uint64_t oa_metrics_set_id;
- int oa_format;
-
- /* For indexing into the accumulator[] ... */
- int gpu_time_offset;
- int gpu_clock_offset;
- int a_offset;
- int b_offset;
- int c_offset;
-
- /* Register programming for a given query */
- struct brw_perf_query_register_prog *flex_regs;
- uint32_t n_flex_regs;
-
- struct brw_perf_query_register_prog *mux_regs;
- uint32_t n_mux_regs;
-
- struct brw_perf_query_register_prog *b_counter_regs;
- uint32_t n_b_counter_regs;
-};
+struct gen_perf;
struct brw_uploader {
struct brw_bufmgr *bufmgr;
struct brw_bo *bo,
uint32_t offset_in_bytes,
uint32_t report_id);
+
+ void (*emit_compute_walker)(struct brw_context *brw);
+ void (*emit_raw_pipe_control)(struct brw_context *brw, uint32_t flags,
+ struct brw_bo *bo, uint32_t offset,
+ uint64_t imm);
} vtbl;
struct brw_bufmgr *bufmgr;
GLuint primitive; /**< Hardware primitive, such as _3DPRIM_TRILIST. */
+ bool object_preemption; /**< Object level preemption enabled. */
+
GLenum reduced_primitive;
/**
/* High bits of the last seen index buffer address (for workarounds). */
uint16_t last_bo_high_bits;
+
+ /* Used to understand is GPU state of primitive restart is up to date */
+ bool enable_cut_index;
} ib;
/* Active vertex program:
bool supported;
} predicate;
- struct {
- /* Variables referenced in the XML meta data for OA performance
- * counters, e.g in the normalization equations.
- *
- * All uint64_t for consistent operand types in generated code
- */
- struct {
- uint64_t timestamp_frequency; /** $GpuTimestampFrequency */
- uint64_t n_eus; /** $EuCoresTotalCount */
- uint64_t n_eu_slices; /** $EuSlicesTotalCount */
- uint64_t n_eu_sub_slices; /** $EuSubslicesTotalCount */
- uint64_t eu_threads_count; /** $EuThreadsCount */
- uint64_t slice_mask; /** $SliceMask */
- uint64_t subslice_mask; /** $SubsliceMask */
- uint64_t gt_min_freq; /** $GpuMinFrequency */
- uint64_t gt_max_freq; /** $GpuMaxFrequency */
- uint64_t revision; /** $SkuRevisionId */
- } sys_vars;
-
- /* OA metric sets, indexed by GUID, as know by Mesa at build time,
- * to cross-reference with the GUIDs of configs advertised by the
- * kernel at runtime
- */
- struct hash_table *oa_metrics_table;
-
- /* Location of the device's sysfs entry. */
- char sysfs_dev_dir[256];
-
- struct brw_perf_query_info *queries;
- int n_queries;
-
- /* The i915 perf stream we open to setup + enable the OA counters */
- int oa_stream_fd;
-
- /* An i915 perf stream fd gives exclusive access to the OA unit that will
- * report counter snapshots for a specific counter set/profile in a
- * specific layout/format so we can only start OA queries that are
- * compatible with the currently open fd...
- */
- int current_oa_metrics_set_id;
- int current_oa_format;
-
- /* List of buffers containing OA reports */
- struct exec_list sample_buffers;
-
- /* Cached list of empty sample buffers */
- struct exec_list free_sample_buffers;
-
- int n_active_oa_queries;
- int n_active_pipeline_stats_queries;
-
- /* The number of queries depending on running OA counters which
- * extends beyond brw_end_perf_query() since we need to wait until
- * the last MI_RPC command has parsed by the GPU.
- *
- * Accurate accounting is important here as emitting an
- * MI_REPORT_PERF_COUNT command while the OA unit is disabled will
- * effectively hang the gpu.
- */
- int n_oa_users;
-
- /* To help catch an spurious problem with the hardware or perf
- * forwarding samples, we emit each MI_REPORT_PERF_COUNT command
- * with a unique ID that we can explicitly check for...
- */
- int next_query_start_report_id;
-
- /**
- * An array of queries whose results haven't yet been assembled
- * based on the data in buffer objects.
- *
- * These may be active, or have already ended. However, the
- * results have not been requested.
- */
- struct brw_perf_query_object **unaccumulated;
- int unaccumulated_elements;
- int unaccumulated_array_size;
-
- /* The total number of query objects so we can relinquish
- * our exclusive access to perf if the application deletes
- * all of its objects. (NB: We only disable perf while
- * there are no active queries)
- */
- int n_query_instances;
- } perfquery;
+ struct gen_perf_context *perf_ctx;
int num_atoms[BRW_NUM_PIPELINES];
const struct brw_tracked_state render_atoms[76];
*/
enum isl_aux_usage draw_aux_usage[MAX_DRAW_BUFFERS];
+ enum gen9_astc5x5_wa_tex_type gen9_astc5x5_wa_tex_mask;
+
+ /** Last rendering scale argument provided to brw_emit_hashing_mode(). */
+ unsigned current_hash_scale;
+
__DRIcontext *driContext;
struct intel_screen *screen;
};
__DRIdrawable *drawable);
void intel_prepare_render(struct brw_context *brw);
+void gen9_apply_single_tex_astc5x5_wa(struct brw_context *brw,
+ mesa_format format,
+ enum isl_aux_usage aux_usage);
+
void brw_predraw_resolve_inputs(struct brw_context *brw, bool rendering,
bool *draw_aux_buffer_disabled);
unsigned *error,
void *sharedContextPrivate);
-/*======================================================================
- * brw_misc_state.c
- */
-void
-brw_meta_resolve_color(struct brw_context *brw,
- struct intel_mipmap_tree *mt);
-
/*======================================================================
* brw_misc_state.c
*/
void brw_workaround_depthstencil_alignment(struct brw_context *brw,
GLbitfield clear_mask);
+void brw_emit_hashing_mode(struct brw_context *brw, unsigned width,
+ unsigned height, unsigned scale);
/* brw_object_purgeable.c */
void brw_init_object_purgeable_functions(struct dd_function_table *functions);
void brw_emit_query_end(struct brw_context *brw);
void brw_query_counter(struct gl_context *ctx, struct gl_query_object *q);
bool brw_is_query_pipelined(struct brw_query_object *query);
-uint64_t brw_timebase_scale(struct brw_context *brw, uint64_t gpu_timestamp);
uint64_t brw_raw_timestamp_delta(struct brw_context *brw,
uint64_t time0, uint64_t time1);
uint32_t reg, uint32_t imm);
void brw_load_register_imm64(struct brw_context *brw,
uint32_t reg, uint64_t imm);
-void brw_load_register_reg(struct brw_context *brw, uint32_t src,
- uint32_t dest);
-void brw_load_register_reg64(struct brw_context *brw, uint32_t src,
- uint32_t dest);
+void brw_load_register_reg(struct brw_context *brw, uint32_t dst,
+ uint32_t src);
+void brw_load_register_reg64(struct brw_context *brw, uint32_t dst,
+ uint32_t src);
void brw_store_data_imm32(struct brw_context *brw, struct brw_bo *bo,
uint32_t offset, uint32_t imm);
void brw_store_data_imm64(struct brw_context *brw, struct brw_bo *bo,
/*======================================================================
* brw_program.c
*/
-static inline bool
-key_debug(struct brw_context *brw, const char *name, int a, int b)
-{
- if (a != b) {
- perf_debug(" %s %d->%d\n", name, a, b);
- return true;
- }
- return false;
-}
-
void brwInitFragProgFuncs( struct dd_function_table *functions );
void brw_get_scratch_bo(struct brw_context *brw,
/* brw_draw_upload.c */
unsigned brw_get_vertex_surface_type(struct brw_context *brw,
- const struct gl_array_attributes *glattr);
+ const struct gl_vertex_format *glformat);
static inline unsigned
brw_get_index_type(unsigned index_size)